[GRASS-SVN] r35770 - grass/branches/develbranch_6/include/Make

[svn_grass at osgeo.org]

Author: neteler
Date: 2009-02-05 03:51:07 -0500 (Thu, 05 Feb 2009)
New Revision: 35770

Modified:
   grass/branches/develbranch_6/include/Make/Shlib.make
Log:
fix for trac #469 implemented (fix Windows binary mode + compilation)

Modified: grass/branches/develbranch_6/include/Make/Shlib.make
===================================================================
--- grass/branches/develbranch_6/include/Make/Shlib.make	2009-02-05 08:50:54 UTC (rev 35769)
+++ grass/branches/develbranch_6/include/Make/Shlib.make	2009-02-05 08:51:07 UTC (rev 35770)
@@ -2,11 +2,16 @@
 
 SHLIB = $(ARCH_LIBDIR)/$(SHLIB_PREFIX)$(SHLIB_NAME).$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX)
 
+# Object that calls _setfmode(_O_BINARY) which must be linked to each DLL on Windows
+ifdef MINGW
+  DLLMAIN_OBJ = $(MODULE_TOPDIR)/lib/gis/$(OBJDIR)/dllmain.o
+endif
+
 CFLAGS += $(SHLIB_CFLAGS) $(NLS_CFLAGS)
 LDFLAGS += $(SHLIB_LDFLAGS)
 
 $(SHLIB): $(SHLIB_OBJS)
-	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) && \
+	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) $(DLLMAIN_OBJ) && \
 	(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
 
 shlib: $(SHLIB)