Merge pull request #6 from DrChat/msvc

Fix MSVC Builds
NatronGitHub · Jan 18, 2018 · 7f135de · 7f135de
2 parents cd66143 + 71b715c
commit 7f135de
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/ofxsOGLFontUtils.h b/ofxsOGLFontUtils.h
@@ -51,6 +51,12 @@
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #else
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#include <windows.h>
+#endif
+
 #include <GL/gl.h>
 #endif
 

diff --git a/ofxsTransform3x3.cpp b/ofxsTransform3x3.cpp
@@ -387,7 +387,6 @@ Transform3x3Plugin::setupAndProcess(Transform3x3ProcessorBase &processor,
 // - If two consecutive points have a chage of Z-sign, find a point close to the point with the negative z with a Z equal to 0.
 // This gives a direction which must be fully included in the rod, and thus a full quadrant must be included, ie an infinite
 // value for one of the x bounds and an infinite value for one of the y bounds.
-#warning TODO
 static void
 ofxsTransformRegionFromPoints(const Point3D p[4],
                               OfxRectD &rod)

diff --git a/ofxsTransformInteract.cpp b/ofxsTransformInteract.cpp
@@ -30,6 +30,12 @@
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #else
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#include <windows.h>
+#endif
+
 #include <GL/gl.h>
 #endif