瀏覽代碼

ogsf: Fix compilation for Windows

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72987 15284696-431f-4ddb-bdfa-cd5b030d7da7
Huidae Cho 6 年之前
父節點
當前提交
5e3d89125b
共有 2 個文件被更改,包括 2 次插入3 次删除
  1. 1 0
      include/Make/Grass.make
  2. 1 3
      lib/ogsf/gsd_prim.c

+ 1 - 0
include/Make/Grass.make

@@ -249,6 +249,7 @@ endif
 
 ifeq ($(OPENGL_WINDOWS),1)
 NVIZDEPS += -lgdi32
+OGSFDEPS += -lgdi32
 endif
 ifneq ($(OPENGL_X11),)
 NVIZDEPS += $(XLIBPATH) $(XLIB) $(XEXTRALIBS)

+ 1 - 3
lib/ogsf/gsd_prim.c

@@ -32,9 +32,7 @@
 #elif defined(OPENGL_WINDOWS)
 #include <GL/gl.h>
 #include <GL/glu.h>
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
+#include <wingdi.h>
 #endif
 
 #include <grass/gis.h>