|
From: <sg...@us...> - 2007-10-28 06:47:27
|
Revision: 106
http://toc.svn.sourceforge.net/toc/?rev=106&view=rev
Author: sgbeal
Date: 2007-10-27 23:47:32 -0700 (Sat, 27 Oct 2007)
Log Message:
-----------
corrected args ordering for .DLL targets to avoid undefined symbols
Modified Paths:
--------------
make-book/trunk/code/ShakeNMake/shake-n-make.make
Modified: make-book/trunk/code/ShakeNMake/shake-n-make.make
===================================================================
--- make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-10-28 03:41:29 UTC (rev 105)
+++ make-book/trunk/code/ShakeNMake/shake-n-make.make 2007-10-28 06:47:32 UTC (rev 106)
@@ -411,6 +411,12 @@
$(INCLUDES) $($(*).OBJ.INCLUDES) \
$(CPPFLAGS) $($(*).OBJ.CPPFLAGS) \
-c -o $@ $<
+%.o: %.cxx
+ @$(call ShakeNMake.CALL.SETX,"CXX [$@] ..."); \
+ $(CXX) $(CXXFLAGS) $($(*).OBJ.CXXFLAGS) \
+ $(INCLUDES) $($(*).OBJ.INCLUDES) \
+ $(CPPFLAGS) $($(*).OBJ.CPPFLAGS) \
+ -c -o $@ $<
# end %.o: %.cpp rules
########################################################################
@@ -484,8 +490,9 @@
@test x = "x$$($(1).DLL.OBJECTS)$$($(1).DLL.SOURCES)" && { \
echo "$(1).DLL.OBJECTS and/or $(1).DLL.SOURCES are/is undefined!"; exit 1; }; \
$(call ShakeNMake.CALL.SETX,"CXX [$$@] ..."); \
- $$(CXX) -o $$@ -shared -export-dynamic $$(LDFLAGS) \
- $$($(1).DLL.LDFLAGS) $$($(1).DLL.OBJECTS) $$($(1).DLL.SOURCES) \
+ $$(CXX) -o $$@ -shared $$(LDFLAGS) \
+ $$($(1).DLL.OBJECTS) $$($(1).DLL.SOURCES) \
+ $$($(1).DLL.LDFLAGS) \
$$($(1).DLL.CPPFLAGS)
endef
########################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|