[Scummvm-cvs-logs] SF.net SVN: scummvm: [28052] scummex/branches/gsoc2007-gameresbrowser/gcc/ Makefile

zbychs at users.sourceforge.net zbychs at users.sourceforge.net
Fri Jul 13 06:50:11 CEST 2007


Revision: 28052
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28052&view=rev
Author:   zbychs
Date:     2007-07-12 21:50:11 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
so-free Linux build working

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile

Modified: scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-13 04:21:58 UTC (rev 28051)
+++ scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-13 04:50:11 UTC (rev 28052)
@@ -8,12 +8,12 @@
 
 .PHONY : bundle debug dots tell depend \
             all clean clean_objs clean_d \
-	    copy_data clean_data copy_so \
+	    copy_data clean_data \
 	    core browser basic scumm browserapp \
 	    dirs
 
 
-all: tell browserapp basic scumm copy_so copy_data
+all: tell browserapp copy_data
 
 ###########################################################################################
 
@@ -21,7 +21,6 @@
 OUT_DIR = ./out
 
 DATA_OUTPUT = $(BROWSERAPP_OUTPUT)
-SO_OUTPUT = $(BROWSERAPP_OUTPUT)
 
 CORE_DIR = $(SOURCES_DIR)/core
 BROWSER_DIR = $(SOURCES_DIR)/browser
@@ -62,10 +61,10 @@
 BASIC_LIB = basic
 SCUMM_LIB = scumm
 
-CORE_TARGET = $(CORE_OUTPUT)/lib$(CORE_LIB).so
-BROWSER_TARGET = $(BROWSER_OUTPUT)/lib$(BROWSER_LIB).so
-BASIC_TARGET = $(BASIC_OUTPUT)/lib$(BASIC_LIB).so
-SCUMM_TARGET = $(SCUMM_OUTPUT)/lib$(SCUMM_LIB).so
+CORE_TARGET = $(CORE_OUTPUT)/lib$(CORE_LIB).a
+BROWSER_TARGET = $(BROWSER_OUTPUT)/lib$(BROWSER_LIB).a
+BASIC_TARGET = $(BASIC_OUTPUT)/lib$(BASIC_LIB).a
+SCUMM_TARGET = $(SCUMM_OUTPUT)/lib$(SCUMM_LIB).a
 
 BROWSERAPP_TARGET = $(BROWSERAPP_OUTPUT)/browser
 
@@ -97,7 +96,7 @@
 WX_VERSION = 2.8
 WX_CONFIG = wx-config
 #WX_CONFIG = /usr/bin/wx-config
-WX_OPTS = --version=$(WX_VERSION) --debug=$(WX_DEBUG) --unicode=$(WX_UNICODE) --static=no
+WX_OPTS = --version=$(WX_VERSION) --debug=$(WX_DEBUG) --unicode=$(WX_UNICODE)
 WX_FLAGS = $(shell $(WX_CONFIG) $(WX_OPTS) --cxxflags)
 WX_LIBS = $(shell $(WX_CONFIG) $(WX_OPTS) --libs)
 
@@ -112,7 +111,7 @@
     GLOBAL_DEFINES = UNIX WXUSINGDLL $(UNICODE)
 endif
 
-BASE_FLAGS = -g -fPIC $(patsubst %, -I%, $(ALL_DIRS) ) $(patsubst %, -D%, $(GLOBAL_DEFINES) ) \
+BASE_FLAGS = -g $(patsubst %, -I%, $(ALL_DIRS) ) $(patsubst %, -D%, $(GLOBAL_DEFINES) ) \
              $(patsubst %, -L%, $(ALL_OUTPUT) )
 CXXFLAGS = $(BASE_FLAGS) $(WX_FLAGS)
 
@@ -143,7 +142,6 @@
 	$(MKDIR) GameResourceBrowser.app
 	$(MKDIR) GameResourceBrowser.app/Contents
 	$(MKDIR) GameResourceBrowser.app/Contents/MacOS
-	$(MKDIR) GameResourceBrowser.app/Contents/PlugIns
 	$(MKDIR) GameResourceBrowser.app/Contents/Resources
 #	$(MKDIR) GameResourceBrowser.app/Contents/Resources/English.lproj
 	cp mac/Info.plist GameResourceBrowser.app/Contents/
@@ -154,7 +152,6 @@
 #	cp mac/res/* GameResourceBrowser.app/Contents/Resources/
 	cp -f -R $(SOURCES_DIR)/data GameResourceBrowser.app/Contents/Resources/data
 	cp -f -R $(SOURCES_DIR)/help GameResourceBrowser.app/Contents/Resources/help
-	cp -f -R $(SO_OUTPUT)/*.so GameResourceBrowser.app/Contents/PlugIns
 
 
 ###########################################################################################
@@ -178,7 +175,6 @@
 
 clean_objs:
 	rm -f $(ALL_OBJECTS) $(ALL_TARGETS)
-	rm -f $(SO_OUTPUT)/*.so
 
 clean_d:
 	rm -f $(ALL_D)
@@ -196,13 +192,6 @@
 	cp -f -R $(SOURCES_DIR)/data $(DATA_OUTPUT)/data
 	cp -f -R $(SOURCES_DIR)/help $(DATA_OUTPUT)/help
 
-copy_so:
-	$(MKDIR) $(SO_OUTPUT)
-	cp -f -R $(CORE_TARGET) $(SO_OUTPUT)/lib$(CORE_LIB).so
-	cp -f -R $(BROWSER_TARGET) $(SO_OUTPUT)/lib$(BROWSER_LIB).so
-	cp -f -R $(BASIC_TARGET) $(SO_OUTPUT)/lib$(BASIC_LIB).so
-	cp -f -R $(SCUMM_TARGET) $(SO_OUTPUT)/lib$(SCUMM_LIB).so
-
 ###########################################################################################
 
 $(ALL_OBJECTS) : %.o : %.cpp
@@ -211,10 +200,10 @@
 ###########################################################################################
 
 dirs:
-	$(MKDIR) $(CORE_OUTPUT)
-	$(MKDIR) $(BROWSER_OUTPUT)
-	$(MKDIR) $(BASIC_OUTPUT)
-	$(MKDIR) $(SCUMM_OUTPUT)
+#	$(MKDIR) $(CORE_OUTPUT)
+#	$(MKDIR) $(BROWSER_OUTPUT)
+#	$(MKDIR) $(BASIC_OUTPUT)
+#	$(MKDIR) $(SCUMM_OUTPUT)
 	$(MKDIR) $(BROWSERAPP_OUTPUT)
 
 ###########################################################################################
@@ -230,18 +219,16 @@
 
 
 $(CORE_TARGET) : $(CORE_OBJECTS)
-	g++ $(CXXFLAGS) -shared -Wl,-soname,lib$(CORE_LIB).so -o $(CORE_TARGET) $^
-#	ln -sf /opt/lib/libctest.so.1.0 /opt/lib/libctest.so.1
-#	ln -sf /opt/lib/libctest.so.1 /opt/lib/libctest.so
+	ar rcs $@ $<
 
 $(BROWSER_TARGET) : $(BROWSER_OBJECTS)
-	g++ $(CXXFLAGS) -shared -Wl,-soname,lib$(BROWSER_LIB).so -o $(BROWSER_TARGET) -l$(CORE_LIB) $^
+	ar rcs $@ $<
 
 $(BASIC_TARGET) : $(BASIC_OBJECTS)
-	g++ $(CXXFLAGS) -shared -Wl,-soname,lib$(BASIC_LIB).so -o $(BASIC_TARGET) -l$(CORE_LIB) -l$(BROWSER_LIB) $^
+	ar rcs $@ $<
 
 $(SCUMM_TARGET) : $(SCUMM_OBJECTS)
-	g++ $(CXXFLAGS) -shared -Wl,-soname,lib$(SCUMM_LIB).so -o $(SCUMM_TARGET) -l$(CORE_LIB) -l$(BROWSER_LIB) -l$(BASIC_LIB) $^
+	ar rcs $@ $<
 
 ###########################################################################################
 
@@ -250,9 +237,12 @@
 #HACK_OBJS = $(CORE_OUTPUT)/CoreFileTypes.o $(CORE_OUTPUT)/CoreInterfaces.o \
 #	    $(COMMON_OUTPUT)/xorstream.o 
 
-$(BROWSERAPP_TARGET): $(BROWSERAPP_OBJECTS) core browser
-	g++ $(CXXFLAGS) -o $@ $(BROWSERAPP_OBJECTS) $(HACK_OBJS) $(WX_LIBS) -l$(CORE_LIB) -l$(BROWSER_LIB)
+#$(BROWSERAPP_TARGET): $(BROWSERAPP_OBJECTS) core browser basic scumm
+#	g++ $(CXXFLAGS) -o $@ $(BROWSERAPP_OBJECTS) $(HACK_OBJS) $(WX_LIBS) -l$(CORE_LIB) -l$(BROWSER_LIB) -l$(BASIC_LIB) -l$(SCUMM_LIB)
 
+$(BROWSERAPP_TARGET): $(ALL_OBJECTS)
+	g++ $(CXXFLAGS) -o $@ $^ $(WX_LIBS)
+
 ###########################################################################################
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list