[Scummvm-cvs-logs] SF.net SVN: scummvm:[54851] scummvm/branches/branch-1-2-0/backends/platform /ps2

sunmax at users.sourceforge.net sunmax at users.sourceforge.net
Fri Dec 10 07:36:25 CET 2010


Revision: 54851
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54851&view=rev
Author:   sunmax
Date:     2010-12-10 06:36:25 +0000 (Fri, 10 Dec 2010)

Log Message:
-----------
Updated PS2 Makefiles to include "-fno-rtti -fno-exceptions -G2" (as already used for release build) to produce a more compact ELF with STATIC_PLUGIN and lot of engines. Aesthetic cleanup.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/backends/platform/ps2/Makefile.gdb
    scummvm/branches/branch-1-2-0/backends/platform/ps2/Makefile.ps2

Modified: scummvm/branches/branch-1-2-0/backends/platform/ps2/Makefile.gdb
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/ps2/Makefile.gdb	2010-12-10 02:10:18 UTC (rev 54850)
+++ scummvm/branches/branch-1-2-0/backends/platform/ps2/Makefile.gdb	2010-12-10 06:36:25 UTC (rev 54851)
@@ -1,39 +1,53 @@
 # $Header: Exp $
  include $(PS2SDK)/Defs.make
 
-PS2_EXTRA = /media/disk/nw8240/extras/scummvm/ports
+PS2_EXTRA = /works/devel/ps2/sdk-extra
 PS2_EXTRA_INCS = /zlib/include /libmad/ee/include /SjPcm/ee/src /tremor
 PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /tremor/tremor
 
 ENABLED=STATIC_PLUGIN
 
+#control build
+DISABLE_SCALERS = true
+DISABLE_HQ_SCALERS = true
+
 ENABLE_SCUMM = $(ENABLED)
 ENABLE_SCUMM_7_8 = $(ENABLED)
-#ENABLE_HE = $(ENABLED)
-#ENABLE_AGI = $(ENABLED)
-#ENABLE_AGOS = $(ENABLED)
-#ENABLE_CINE = $(ENABLED)
-#ENABLE_CRUISE = $(ENABLED)
-#ENABLE_DRASCULA = $(ENABLED)
-#ENABLE_GOB = $(ENABLED)
-#ENABLE_KYRA = $(ENABLED)
-#ENABLE_LURE = $(ENABLED)
- # ENABLE_M4 = $(ENABLED)
-#ENABLE_MADE = $(ENABLED)
-#ENABLE_PARALLACTION = $(ENABLED)
-#ENABLE_QUEEN = $(ENABLED)
-#ENABLE_SAGA = $(ENABLED)
-#ENABLE_SAGA2 = $(ENABLED)
-#ENABLE_IHNM = $(ENABLED)
-#ENABLE_SKY = $(ENABLED)
-#ENABLE_SWORD1 = $(ENABLED)
-#ENABLE_SWORD2 = $(ENABLED)
- # ENABLE_TINSEL = $(ENABLED)
-#ENABLE_TOUCHE = $(ENABLED)
+# ENABLE_HE = $(ENABLED)
+# ENABLE_AGI = $(ENABLED)
+# ENABLE_AGOS = $(ENABLED)
+# ENABLE_AGOS2 = $(ENABLED)
+# ENABLE_CINE = $(ENABLED)
+# ENABLE_CRUISE = $(ENABLED)
+# ENABLE_DRACI = $(ENABLED)
+# ENABLE_DRASCULA = $(ENABLED)
+# ENABLE_GOB = $(ENABLED)
+# ENABLE_GROOVIE = $(ENABLED)
+## ENABLE_GROOVIE2 = $(ENABLED)
+# ENABLE_IHNM = $(ENABLED)
+# ENABLE_KYRA = $(ENABLED)
+## ENABLE_LOL = $(ENABLED)
+# ENABLE_LURE = $(ENABLED)
+## ENABLE_M4 = $(ENABLED)
+# ENABLE_MADE = $(ENABLED)
+# ENABLE_PARALLACTION = $(ENABLED)
+# ENABLE_QUEEN = $(ENABLED)
+# ENABLE_SAGA = $(ENABLED)
+# ENABLE_SAGA2 = $(ENABLED)
+# ENABLE_SCI = $(ENABLED)
+## ENABLE_SCI32 = $(ENABLED)
+# ENABLE_SKY = $(ENABLED)
+# ENABLE_SWORD1 = $(ENABLED)
+# ENABLE_SWORD2 = $(ENABLED)
+# ENABLE_TEENAGENT = $(ENABLED)
+# ENABLE_TINSEL = $(ENABLED)
+# ENABLE_TOUCHE = $(ENABLED)
+# ENABLE_TUCKER = $(ENABLED)
 
+
 HAVE_GCC3 = true
 
-CC		= ee-gcc
+CC      = ee-gcc
 CXX     = ee-g++
 AS      = ee-gcc
 LD      = ee-gcc
@@ -48,40 +62,39 @@
 INCDIR = ../../../
 # DEPDIR = .deps
 
-DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar
+DEFINES  = -DRELEASE_BUILD -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -D__PS2_DEBUG__ -g -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
 
-
 INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) 
 INCLUDES += -I $(PS2GDB)/ee -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
 
+CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
+
 TARGET = elf/scummvm.elf
 
-OBJS := backends/platform/ps2/DmaPipe.o \
-    backends/platform/ps2/Gs2dScreen.o \
-    backends/platform/ps2/irxboot.o \
-	backends/platform/ps2/ps2input.o \
-	backends/platform/ps2/ps2pad.o \
-	backends/platform/ps2/savefilemgr.o \
-    backends/platform/ps2/fileio.o \
-    backends/platform/ps2/asyncfio.o \
-	backends/platform/ps2/icon.o \
-    backends/platform/ps2/cd.o \
-    backends/platform/ps2/eecodyvdfs.o \
-    backends/platform/ps2/rpckbd.o \
-    backends/platform/ps2/systemps2.o \
-    backends/platform/ps2/ps2mutex.o \
-    backends/platform/ps2/ps2time.o \
-	backends/platform/ps2/ps2debug.o
+OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
+	$(srcdir)/backends/platform/ps2/Gs2dScreen.o \
+	$(srcdir)/backends/platform/ps2/irxboot.o \
+	$(srcdir)/backends/platform/ps2/ps2input.o \
+	$(srcdir)/backends/platform/ps2/ps2pad.o \
+	$(srcdir)/backends/platform/ps2/savefilemgr.o \
+	$(srcdir)/backends/platform/ps2/fileio.o \
+	$(srcdir)/backends/platform/ps2/asyncfio.o \
+	$(srcdir)/backends/platform/ps2/icon.o \
+	$(srcdir)/backends/platform/ps2/cd.o \
+	$(srcdir)/backends/platform/ps2/eecodyvdfs.o \
+	$(srcdir)/backends/platform/ps2/rpckbd.o \
+	$(srcdir)/backends/platform/ps2/systemps2.o \
+	$(srcdir)/backends/platform/ps2/ps2mutex.o \
+	$(srcdir)/backends/platform/ps2/ps2time.o \
+	$(srcdir)/backends/platform/ps2/ps2debug.o
     
 MODULE_DIRS += .
 
-BACKEND := ps2
-
 include $(srcdir)/Makefile.common
 
-LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile 
+LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile
 LDFLAGS += -L $(PS2GDB)/lib  -L $(PS2SDK)/ee/lib -L .
-LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS)) 
+LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS))
 LDFLAGS += -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lmad -ltremor -lz -lm -lc -lfileXio -lps2gdbStub -lps2ip -ldebug -lkernel -lstdc++
 
 all: $(TARGET)

Modified: scummvm/branches/branch-1-2-0/backends/platform/ps2/Makefile.ps2
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/ps2/Makefile.ps2	2010-12-10 02:10:18 UTC (rev 54850)
+++ scummvm/branches/branch-1-2-0/backends/platform/ps2/Makefile.ps2	2010-12-10 06:36:25 UTC (rev 54851)
@@ -7,33 +7,49 @@
 
 ENABLED=STATIC_PLUGIN
 
+#control build
+DISABLE_SCALERS = true
+DISABLE_HQ_SCALERS = true
+
 ENABLE_SCUMM = $(ENABLED)
 ENABLE_SCUMM_7_8 = $(ENABLED)
 ENABLE_HE = $(ENABLED)
 ENABLE_AGI = $(ENABLED)
 ENABLE_AGOS = $(ENABLED)
+ENABLE_AGOS2 = $(ENABLED)
 ENABLE_CINE = $(ENABLED)
 ENABLE_CRUISE = $(ENABLED)
+ENABLE_DRACI = $(ENABLED)
 ENABLE_DRASCULA = $(ENABLED)
 ENABLE_GOB = $(ENABLED)
+ENABLE_GROOVIE = $(ENABLED)
+# ENABLE_GROOVIE2 = $(ENABLED)
+# ENABLE_HUGO = $(ENABLED)
+ENABLE_IHNM = $(ENABLED)
 ENABLE_KYRA = $(ENABLED)
+# ENABLE_LOL = $(ENABLED)
 ENABLE_LURE = $(ENABLED)
 # ENABLE_M4 = $(ENABLED)
 ENABLE_MADE = $(ENABLED)
+# ENABLE_MOHAWK = $(ENABLED)
 ENABLE_PARALLACTION = $(ENABLED)
 ENABLE_QUEEN = $(ENABLED)
 ENABLE_SAGA = $(ENABLED)
-ENABLE_SAGA2 = $(ENABLED)
-ENABLE_IHNM = $(ENABLED)
+# ENABLE_SAGA2 = $(ENABLED)
+ENABLE_SCI = $(ENABLED)
+# ENABLE_SCI32 = $(ENABLED)
 ENABLE_SKY = $(ENABLED)
 ENABLE_SWORD1 = $(ENABLED)
 ENABLE_SWORD2 = $(ENABLED)
-# ENABLE_TINSEL = $(ENABLED)
+ENABLE_TEENAGENT = $(ENABLED)
+ENABLE_TINSEL = $(ENABLED)
 ENABLE_TOUCHE = $(ENABLED)
+ENABLE_TUCKER = $(ENABLED)
 
+
 HAVE_GCC3 = true
 
-CC		= ee-gcc
+CC      = ee-gcc
 CXX     = ee-g++
 AS      = ee-gcc
 LD      = ee-gcc
@@ -48,30 +64,31 @@
 INCDIR = ../../../
 # DEPDIR = .deps
 
-DEFINES  = -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar
+DEFINES  = -DRELEASE_BUILD -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions # -DNO_ADAPTOR
 
-
 INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) 
 INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
 
+CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
+
 TARGET = elf/scummvm.elf
 
-OBJS := backends/platform/ps2/DmaPipe.o \
-    backends/platform/ps2/Gs2dScreen.o \
-    backends/platform/ps2/irxboot.o \
-	backends/platform/ps2/ps2input.o \
-	backends/platform/ps2/ps2pad.o \
-	backends/platform/ps2/savefilemgr.o \
-    backends/platform/ps2/fileio.o \
-    backends/platform/ps2/asyncfio.o \
-	backends/platform/ps2/icon.o \
-    backends/platform/ps2/cd.o \
-    backends/platform/ps2/eecodyvdfs.o \
-    backends/platform/ps2/rpckbd.o \
-    backends/platform/ps2/systemps2.o \
-    backends/platform/ps2/ps2mutex.o \
-    backends/platform/ps2/ps2time.o \
-	backends/platform/ps2/ps2debug.o
+OBJS := $(srcdir)/backends/platform/ps2/DmaPipe.o \
+	$(srcdir)/backends/platform/ps2/Gs2dScreen.o \
+	$(srcdir)/backends/platform/ps2/irxboot.o \
+	$(srcdir)/backends/platform/ps2/ps2input.o \
+	$(srcdir)/backends/platform/ps2/ps2pad.o \
+	$(srcdir)/backends/platform/ps2/savefilemgr.o \
+	$(srcdir)/backends/platform/ps2/fileio.o \
+	$(srcdir)/backends/platform/ps2/asyncfio.o \
+	$(srcdir)/backends/platform/ps2/icon.o \
+	$(srcdir)/backends/platform/ps2/cd.o \
+	$(srcdir)/backends/platform/ps2/eecodyvdfs.o \
+	$(srcdir)/backends/platform/ps2/rpckbd.o \
+	$(srcdir)/backends/platform/ps2/systemps2.o \
+	$(srcdir)/backends/platform/ps2/ps2mutex.o \
+	$(srcdir)/backends/platform/ps2/ps2time.o \
+	$(srcdir)/backends/platform/ps2/ps2debug.o
     
 MODULE_DIRS += .
 
@@ -79,11 +96,11 @@
 
 include $(srcdir)/Makefile.common
 
-LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile 
+LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T $(PS2SDK)/ee/startup/linkfile
 LDFLAGS += -L $(PS2SDK)/ee/lib -L .
-LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS)) 
-LDFLAGS += -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lmad -ltremor -lz -lm -lc -lfileXio -lkernel -lstdc++ 
-LDFLAGS += -s 
+LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS))
+LDFLAGS += -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lmad -ltremor -lz -lm -lc -lfileXio -lkernel -lstdc++
+LDFLAGS += -s
 
 all: $(TARGET)
 


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