[Scummvm-cvs-logs] SF.net SVN: scummvm: [27394] scummvm/branches/branch-0-10-0/backends/ platform/gp32/Makefile

djwillis at users.sourceforge.net djwillis at users.sourceforge.net
Wed Jun 13 22:54:09 CEST 2007


Revision: 27394
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27394&view=rev
Author:   djwillis
Date:     2007-06-13 13:54:08 -0700 (Wed, 13 Jun 2007)

Log Message:
-----------
Slight tidy of the GP32 Makefile to see if the port can be cleaned up enough to build. (Branch 0.10.0)

Modified Paths:
--------------
    scummvm/branches/branch-0-10-0/backends/platform/gp32/Makefile

Modified: scummvm/branches/branch-0-10-0/backends/platform/gp32/Makefile
===================================================================
--- scummvm/branches/branch-0-10-0/backends/platform/gp32/Makefile	2007-06-13 20:41:47 UTC (rev 27393)
+++ scummvm/branches/branch-0-10-0/backends/platform/gp32/Makefile	2007-06-13 20:54:08 UTC (rev 27394)
@@ -1,62 +1,67 @@
-CC		:= arm-elf-gcc
-CXX		:= arm-elf-g++
-LD		:= arm-elf-g++
-AS		:= arm-elf-as
-AR      := arm-elf-ar cru
-RANLIB  := arm-elf-ranlib
-RM      := rm -f
-MKDIR   := mkdir -p
-ECHO    := echo -n
-CAT     := cat
-RM      := rm -f
-# recursive version of RM
-RM_REC  := $(RM) -r
-ZIP     := zip -q
-CP      := cp
-OBJCOPY	:= arm-elf-objcopy
-FXETOOL	:= b2fxec
+#######################################################################
+# GP32 Build Settings                                                 #
+#######################################################################
 
+TOOLROOT	:= 
+CC		:= $(TOOLROOT)arm-eabi-gcc
+CXX		:= $(TOOLROOT)arm-eabi-g++
+LD		:= $(TOOLROOT)arm-eabi-g++
+AS		:= $(TOOLROOT)arm-eabi-as
+AR		:= $(TOOLROOT)arm-eabi-ar cru
+RANLIB		:= $(TOOLROOT)arm-eabi-ranlib
+RM		:= rm -f
+MKDIR		:= mkdir -p
+ECHO		:= echo -n
+CAT		:= cat
+RM		:= rm -f
 
+		#Recursive version of RM
+RM_REC		:= $(RM) -r
+ZIP		:= zip -q
+CP		:= cp
+OBJCOPY		:= $(TOOLROOT)arm-eabi-objcopy
+FXETOOL		:= b2fxec
+
 #######################################################################
 # Default compilation parameters. Normally don't edit these           #
 #######################################################################
 
-CFLAGS =	-marm -march=armv4t -mtune=arm920 -mapcs \
-			-finline-functions \
-			-fshort-enums \
-			-mstructure-size-boundary=32 \
-			-mno-thumb-interwork \
-			-I$(GPSDK)/include \
-			-g \
-			-O2 \
-			-fomit-frame-pointer
-#			-ffast-math \
-#			-fshort-double
+CFLAGS =	-marm -march=armv4t -mtune=arm920t -mapcs \
+		-finline-functions \
+		-fshort-enums \
+		-mstructure-size-boundary=32 \
+		-mno-thumb-interwork \
+		-I$(GPSDK)/include \
+		-g \
+		-O2 \
+		-fomit-frame-pointer
+		#-ffast-math \
+		#-fshort-double
 
-CPPFLAGS:= $(CFLAGS)
-CXXFLAGS:= $(CFLAGS)
-DEFINES :=
-LDFLAGS :=
-INCLUDES:= -I. -Icommon
-LIBS	:=
-OBJS	:=
+CPPFLAGS	:= $(CFLAGS)
+CXXFLAGS	:= $(CFLAGS)
+DEFINES 	:=
+LDFLAGS 	:=
+INCLUDES	:= -I. -Icommon
+LIBS		:=
+OBJS		:=
 
 # Turn on useful warnings
-CXXFLAGS+= -Wall -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
-CXXFLAGS+= -Wshadow -Wuninitialized -Wimplicit -Wundef
-CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
-CXXFLAGS+= -Wwrite-strings -fcheck-new -Wctor-dtor-privacy -Wnon-virtual-dtor
+CXXFLAGS	+=	-Wall -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
+CXXFLAGS	+=	-Wshadow -Wuninitialized -Wimplicit -Wundef
+CXXFLAGS	+=	-Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder
+CXXFLAGS	+=	-Wwrite-strings -fcheck-new -Wctor-dtor-privacy -Wnon-virtual-dtor
 
-# Stripped Build? (Smaller ELF, Minimal debug symbol information).
+# Stripped Build? (Smaller eabi, Minimal debug symbol information).
 # You MUST comment this out with a # if you wish to debug your code.
 STRIP_DEBUG	= -Wl,--strip-debug
 
 # GPSDK (SDK, Includes and Startup Files) base dir
-GPSDK		=	/usr/compat/gp32/share/sdk
+GPSDK		=	/opt/GP32/GPSDK
 
 LDSPECS		=	-specs=gp32_gpsdk.specs
 
-LDFLAGS 	= 	$(STRIP_DEBUG) -Wl,-Map,$(MAPFILE) $(LDSPECS) -Wl,--no-warn-mismatch
+LDFLAGS 	=	$(STRIP_DEBUG) -Wl,-Map,$(MAPFILE) $(LDSPECS) -Wl,--no-warn-mismatch
 
 LIBS		+=	-L$(GPSDK)/lib \
 				-lgpmem -lgpos -lgpstdio -lgpstdlib -lgpsound -lgpgraphic -lgpfont \
@@ -67,27 +72,27 @@
 MODULES		+=	backends/platform/gp32
 
 # Outputs
-EXEEXT		= .elf
-MAPFILE		= scummvm.map
-BIN			= scummvm.gxb
-FXE			= scummvm.fxe
+EXEEXT		=	.elf
+MAPFILE		=	scummvm.map
+BIN		=	scummvm.gxb
+FXE		=	scummvm.fxe
 
 # Plugins hack
-srcdir		= ./
+srcdir		=	./
 
-DEFINES 	= 	-D__GP32__
+DEFINES		=	-D__GP32__
 DEFINES		+=	-DNONSTANDARD_PORT
 
 # Disable new themes. GP32 has LOW memory!
 DEFINES		+=	-DDISABLE_FANCY_THEMES
 
 # Support libtremor.
-#DEFINES		+=	-DUSE_VORBIS -DUSE_TREMOR -DGP32_SDK
+#DEFINES	+=	-DUSE_VORBIS -DUSE_TREMOR -DGP32_SDK
 #INCLUDES	+=	-Ibackends/platform/gp32/gptremor
 #LIBS		+=	-Lbackends/platform/gp32/gptremor -lgptremor
 
 # Support libmad.
-#DEFINES		+=	-DUSE_MAD
+#DEFINES	+=	-DUSE_MAD
 #INCLUDES	+=	-Ibackends/platform/gp32/gpmad
 #LIBS		+=	-Lbackends/platform/gp32/gpmad -lgpmad
 
@@ -102,12 +107,6 @@
 # Support for the unsigned sound mixer.
 DEFINES		+=	-DOUTPUT_UNSIGNED_AUDIO
 
-# Support for the GP32 (fmOPL derived) MIDI engine.
-#	-	NOT fully implemented yet.
-#DEFINES		+=	-DUSE_GP32_FMOPL
-
-
-
 #GP32 Debug - Remove from Release builds
 #	This builds in the GP32 GDB USB Stub. Don't use it unless you know what your doing.
 #	You also need to remove ANY optemisation from the compiler flags.
@@ -159,15 +158,16 @@
 DISABLE_SCUMM_7_8 = 1
 DISABLE_HE = 1
 
-#DISABLE_AGOS = 1
-#DISABLE_SKY = 1
-#DISABLE_QUEEN = 1
-#DISABLE_GOB = 1
-#DISABLE_LURE = 1
-#DISABLE_CINE = 1
-#DISABLE_SAGA = 1
-#DISABLE_KYRA = 1
-#DISABLE_AGI = 1
+# For now just build the SCUMM engine (until the port is stable again).
+DISABLE_AGOS = 1
+DISABLE_SKY = 1
+DISABLE_QUEEN = 1
+DISABLE_GOB = 1
+DISABLE_LURE = 1
+DISABLE_CINE = 1
+DISABLE_SAGA = 1
+DISABLE_KYRA = 1
+DISABLE_AGI = 1
 
 # The engines below are not supported on the GP32 port so there is
 # no point compiling support into the binary.


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