[GRASS-SVN] r41458 - in grass/trunk: lib/form lib/init tools visualization/nviz/src

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-03-16 10:02:15 -0400 (Tue, 16 Mar 2010)
New Revision: 41458

Modified:
   grass/trunk/lib/form/Makefile
   grass/trunk/lib/init/Makefile
   grass/trunk/tools/Makefile
   grass/trunk/visualization/nviz/src/togl.h
Log:
Fix missing embedded manifests
Togl isn't built as a DLL and so doesn't need __declspec(dllexport)


Modified: grass/trunk/lib/form/Makefile
===================================================================
--- grass/trunk/lib/form/Makefile	2010-03-16 13:38:23 UTC (rev 41457)
+++ grass/trunk/lib/form/Makefile	2010-03-16 14:02:15 UTC (rev 41458)
@@ -12,7 +12,7 @@
 
 FORMDIR=$(ARCH_DISTDIR)/etc/form
 FORM=$(FORMDIR)/form.tcl
-FORMPROG=$(FORMDIR)/form
+FORMPROG=$(FORMDIR)/form$(EXE)
 HTMLLIB=$(FORMDIR)/html_library.tcl
 
 ifneq ($(TCLTKLIBS),)
@@ -40,4 +40,4 @@
 	$(INSTALL_DATA) $< $@
 
 $(FORMPROG): $(OBJDIR)/form.o | $(FORMDIR)
-	$(CC) $(LDFLAGS) -o $@ $(OBJDIR)/form.o $(LIBES)
+	$(call linker_base,$(LINK),$(LDFLAGS),$(MANIFEST_OBJ) $(LIBES))

Modified: grass/trunk/lib/init/Makefile
===================================================================
--- grass/trunk/lib/init/Makefile	2010-03-16 13:38:23 UTC (rev 41457)
+++ grass/trunk/lib/init/Makefile	2010-03-16 14:02:15 UTC (rev 41458)
@@ -126,13 +126,13 @@
 	$(INSTALL_DATA) $< $@
 
 $(ETC)/echo$(EXE) $(ETC)/run$(EXE): $(ETC)/%$(EXE): $(OBJDIR)/%.o
-	$(call linker_base,$(LINK),$(LDFLAGS),)
+	$(call linker_base,$(LINK),$(LDFLAGS),$(MANIFEST_OBJ))
 
 $(ETC)/clean_temp$(EXE) $(ETC)/lock$(EXE): $(ETC)/%$(EXE): $(OBJDIR)/%.o
 	$(call linker)
 
 $(ETC)/winlocale$(EXE): $(OBJDIR)/winlocale.o
-	$(call linker_base,$(LINK),$(LDFLAGS) $(EXTRA_LDFLAGS), -lkernel32)
+	$(call linker_base,$(LINK),$(LDFLAGS) $(EXTRA_LDFLAGS),$(MANIFEST_OBJ) -lkernel32)
 
 $(ETC)/VERSIONNUMBER:
 	rm -f $@

Modified: grass/trunk/tools/Makefile
===================================================================
--- grass/trunk/tools/Makefile	2010-03-16 13:38:23 UTC (rev 41457)
+++ grass/trunk/tools/Makefile	2010-03-16 14:02:15 UTC (rev 41458)
@@ -11,4 +11,4 @@
 	$(INSTALL) $< $@
 
 $(TOOLSDIR)/g.echo$(EXE): $(OBJDIR)/g.echo.o
-	$(call linker_base,$(LINK),$(LDFLAGS) $(EXTRA_LDFLAGS),)
+	$(call linker_base,$(LINK),$(LDFLAGS) $(EXTRA_LDFLAGS),$(MANIFEST_OBJ))

Modified: grass/trunk/visualization/nviz/src/togl.h
===================================================================
--- grass/trunk/visualization/nviz/src/togl.h	2010-03-16 13:38:23 UTC (rev 41457)
+++ grass/trunk/visualization/nviz/src/togl.h	2010-03-16 14:02:15 UTC (rev 41458)
@@ -22,7 +22,7 @@
 #    endif
 #  endif
 
-#  ifdef _WIN32
+#  ifdef _WIN32____THIS_IS_DISABLED
 #    define TOGL_EXTERN __declspec(dllexport) extern
 #  else
 #    define TOGL_EXTERN extern