[GRASS-SVN] r72987 - in grass/trunk: include/Make lib/ogsf

[svn_grass at osgeo.org]

Author: hcho
Date: 2018-07-14 09:46:03 -0700 (Sat, 14 Jul 2018)
New Revision: 72987

Modified:
   grass/trunk/include/Make/Grass.make
   grass/trunk/lib/ogsf/gsd_prim.c
Log:
ogsf: Fix compilation for Windows

Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make	2018-07-14 11:39:32 UTC (rev 72986)
+++ grass/trunk/include/Make/Grass.make	2018-07-14 16:46:03 UTC (rev 72987)
@@ -249,6 +249,7 @@
 
 ifeq ($(OPENGL_WINDOWS),1)
 NVIZDEPS += -lgdi32
+OGSFDEPS += -lgdi32
 endif
 ifneq ($(OPENGL_X11),)
 NVIZDEPS += $(XLIBPATH) $(XLIB) $(XEXTRALIBS)

Modified: grass/trunk/lib/ogsf/gsd_prim.c
===================================================================
--- grass/trunk/lib/ogsf/gsd_prim.c	2018-07-14 11:39:32 UTC (rev 72986)
+++ grass/trunk/lib/ogsf/gsd_prim.c	2018-07-14 16:46:03 UTC (rev 72987)
@@ -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>