[Scummvm-cvs-logs] CVS: scummvm Makefile.common,1.72,1.73
Max Horn
fingolfin at users.sourceforge.net
Fri Sep 19 17:11:32 CEST 2003
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv16601
Modified Files:
Makefile.common
Log Message:
yet another fix for linux+loadable modules
Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- Makefile.common 19 Sep 2003 22:45:54 -0000 1.72
+++ Makefile.common 20 Sep 2003 00:07:37 -0000 1.73
@@ -47,15 +47,17 @@
CXXFLAGS += -DDYNAMIC_MODULES
# Uncomment these for Mac OS X
-#PLUGIN_LDFLAGS += -bundle -bundle_loader $(EXECUTABLE)
-#LDFLAGS += -all_load
-#LIBS += -ldl
+#PLUGIN_LDFLAGS += -bundle -bundle_loader $(EXECUTABLE)
+#PRE_OBJS_FLAGS := -all_load
+#POST_OBJS_FLAGS :=
+#LIBS += -ldl
# Uncomment these for Linux
-CXXFLAGS += -fpic
-PLUGIN_LDFLAGS += -shared
-LDFLAGS += -Wl,--export-dynamic
-LIBS += -ldl
+CXXFLAGS += -fpic
+PLUGIN_LDFLAGS += -shared
+PRE_OBJS_FLAGS := -Wl,-export-dynamic -Wl,-whole-archive
+POST_OBJS_FLAGS := -Wl,-no-whole-archive
+LIBS += -ldl
endif
@@ -119,7 +121,7 @@
# The build rule for the ScummVM executable
$(EXECUTABLE): $(OBJS)
- $(CXX) $(LDFLAGS) $+ $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
distclean: clean
$(RM_REC) $(DEPDIRS)
More information about the Scummvm-git-logs
mailing list