Fix missing embedded manifests

Togl isn't built as a DLL and so doesn't need __declspec(dllexport)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@41458 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/form/Makefile

@@ -12,7 +12,7 @@ EXTRA_CFLAGS = $(XCFLAGS) $(TCLINCDIR) $(TKINCDIR)
 
 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 @@ $(FORM): form.tcl | $(FORMDIR)
 	$(INSTALL_DATA) $< $@
 
 $(FORMPROG): $(OBJDIR)/form.o | $(FORMDIR)
-	$(CC) $(LDFLAGS) -o $@ $(OBJDIR)/form.o $(LIBES)
+	$(call linker_base,$(LINK),$(LDFLAGS),$(MANIFEST_OBJ) $(LIBES))

lib/init/Makefile

@@ -126,13 +126,13 @@ $(ETC)/functions.sh: functions.sh
 	$(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 $@

tools/Makefile

@@ -11,4 +11,4 @@ $(TOOLSDIR)/mkhtml.py: mkhtml.py
 	$(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))

visualization/nviz/src/togl.h

@@ -22,7 +22,7 @@
 #    endif
 #  endif
 
-#  ifdef _WIN32
+#  ifdef _WIN32____THIS_IS_DISABLED
 #    define TOGL_EXTERN __declspec(dllexport) extern
 #  else
 #    define TOGL_EXTERN extern