[Scummvm-cvs-logs] SF.net SVN: scummvm: [29889] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Dec 16 22:41:10 CET 2007
Revision: 29889
http://scummvm.svn.sourceforge.net/scummvm/?rev=29889&view=rev
Author: fingolfin
Date: 2007-12-16 13:41:10 -0800 (Sun, 16 Dec 2007)
Log Message:
-----------
Patch #1847599: Several enhancements for the build system
Modified Paths:
--------------
scummvm/trunk/Makefile
scummvm/trunk/Makefile.common
scummvm/trunk/backends/platform/ds/arm9/makefile
scummvm/trunk/ports.mk
scummvm/trunk/tools/update-version.pl
Removed Paths:
-------------
scummvm/trunk/backends/platform/ds/arm9/makefile.in
scummvm/trunk/dists/iphone/Info.plist
scummvm/trunk/dists/macosx/Info.plist
Modified: scummvm/trunk/Makefile
===================================================================
--- scummvm/trunk/Makefile 2007-12-16 21:35:15 UTC (rev 29888)
+++ scummvm/trunk/Makefile 2007-12-16 21:41:10 UTC (rev 29889)
@@ -9,8 +9,9 @@
DEFINES := -DHAVE_CONFIG_H
LDFLAGS :=
INCLUDES := -I. -I$(srcdir) -I$(srcdir)/engines
-LIBS :=
-OBJS :=
+LIBS :=
+OBJS :=
+DEPDIR := .deps
MODULES :=
MODULE_DIRS :=
Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common 2007-12-16 21:35:15 UTC (rev 29888)
+++ scummvm/trunk/Makefile.common 2007-12-16 21:41:10 UTC (rev 29889)
@@ -5,26 +5,11 @@
######################################################################
# The default build target: just build the scummvm executable
######################################################################
+
all: $(EXECUTABLE) plugins
######################################################################
-# Various minor settings
-######################################################################
-
-# Files that are to be included in the archive built by "make dist"
-DISTFILES := \
- Makefile Makefile.common \
- AUTHORS NEWS README COPYING COPYRIGHT
-
-# The dist file name
-ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
-
-# The name for the directory used for depenency tracking
-DEPDIR := .deps
-
-
-######################################################################
# Module settings
######################################################################
@@ -53,13 +38,14 @@
DEFINES += -DDISABLE_HQ_SCALERS
endif
+
######################################################################
# The build rules follow - normally you should have no need to
# touch whatever comes after here.
######################################################################
# Concat DEFINES and INCLUDES to form the CPPFLAGS
-CPPFLAGS:= $(DEFINES) $(INCLUDES)
+CPPFLAGS := $(DEFINES) $(INCLUDES)
# Include the build instructions for all modules
-include $(addprefix $(srcdir)/, $(addsuffix /module.mk,$(MODULES)))
@@ -74,7 +60,7 @@
base/version.o: $(filter-out base/libbase.a,$(OBJS))
# The build rule for the ScummVM executable
-$(EXECUTABLE): $(OBJS)
+$(EXECUTABLE): $(OBJS)
$(CXX) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
distclean: clean
@@ -84,8 +70,6 @@
clean:
$(RM) $(OBJS) $(EXECUTABLE)
-.PHONY: all clean dist distclean plugins
-
# Old (dumb) compile & dependcy rules
#INCS = scumm/scumm.h common/scummsys.h
#.cpp.o:
@@ -123,3 +107,72 @@
# Include the dependency tracking files.
-include $(wildcard $(addsuffix /*.d,$(DEPDIRS)))
+
+
+######################################################################
+# Create the files that depend on the version
+######################################################################
+
+VERSION_FILES = \
+ $(srcdir)/dists/iphone/Info.plist \
+ $(srcdir)/dists/macosx/Info.plist
+
+VERSION = $(shell cat "${srcdir}/base/internal_version.h" | cut -d\" -f2)
+VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1)
+VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
+VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)
+VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-)
+
+$(VERSION_FILES): %: %.in
+ @echo "Creating $@"
+ @cat $< | sed \
+ -e "s/@VER_MAJOR@/$(VER_MAJOR)/g" \
+ -e "s/@VER_MINOR@/$(VER_MINOR)/g" \
+ -e "s/@VER_PATCH@/$(VER_PATCH)/g" \
+ -e "s/@VER_EXTRA@/$(VER_EXTRA)/g" \
+ -e "s/@VERSION@/$(VERSION)/g" \
+ > $@
+
+
+######################################################################
+# Distribution settings
+######################################################################
+
+ifeq ($(VER_EXTRA),svn)
+DISTVERSION = $(shell date '+%Y-%m-%d')
+else
+DISTVERSION = $(VERSION)
+endif
+
+DISTNAME := scummvm-$(DISTVERSION)
+DISTDIR := dist
+VERFILE := $(DISTDIR)/$(DISTNAME)/base/internal_version.h
+
+ifeq ($(shell svn stat $(srcdir) 2>&1 | grep "is not a working copy"),)
+SVNROOT := $(srcdir)
+else
+SVNROOT := https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/
+endif
+
+$(VERFILE): $(srcdir)/base/internal_version.h
+ @$(RM_REC) $(DISTDIR)
+ @$(MKDIR) $(DISTDIR)
+ svn export $(SVNROOT) $(DISTDIR)/$(DISTNAME)
+
+$(DISTDIR)/$(DISTNAME).tar.gz: $(VERFILE)
+ cd $(DISTDIR); tar zcf $(DISTNAME).tar.gz $(DISTNAME)
+
+$(DISTDIR)/$(DISTNAME).tar.bz2: $(VERFILE)
+ cd $(DISTDIR); tar jcf $(DISTNAME).tar.bz2 $(DISTNAME)
+
+$(DISTDIR)/$(DISTNAME).zip: $(VERFILE)
+ cd $(DISTDIR); zip -qr9 $(DISTNAME).zip $(DISTNAME)
+
+dist-src: \
+ $(DISTDIR)/$(DISTNAME).tar.gz \
+ $(DISTDIR)/$(DISTNAME).tar.bz2 \
+ $(DISTDIR)/$(DISTNAME).zip
+ @#RPM-src?
+ @#DEB-src?
+
+.PHONY: all clean distclean plugins dist-src
Modified: scummvm/trunk/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile 2007-12-16 21:35:15 UTC (rev 29888)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile 2007-12-16 21:41:10 UTC (rev 29889)
@@ -440,8 +440,8 @@
#---------------------------------------------------------------------------------
%.nds: %.bin
- @echo ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.11.0svn;DS Port"
- ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM 0.11.0svn;DS Port"
+ @echo ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM $(VERSION);DS Port"
+ ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM $(VERSION);DS Port"
dsbuild $@ -l ../ndsloader.bin
padbin 16 $(basename $@).ds.gba
Deleted: scummvm/trunk/backends/platform/ds/arm9/makefile.in
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile.in 2007-12-16 21:35:15 UTC (rev 29888)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile.in 2007-12-16 21:41:10 UTC (rev 29889)
@@ -1,457 +0,0 @@
-#BUILD_PLUGINS = 1
-#libndsdir = $(DEVKITPRO)/libnds
-libndsdir = /home/neil/devkitpro/libnds
-
-# Select the build you want by uncommenting one of the following lines:
-
-
-DS_BUILD_A = 1
-#DS_BUILD_B = 1
-#DS_BUILD_C = 1
-#DS_BUILD_D = 1
-#DS_BUILD_E = 1
-#DS_BUILD_F = 1
-
-# Uncomment the following line to build in support for MP3 audio
-# using libmad:
-
-ifdef DS_BUILD_F
- # TODO: Fix this. When libmad is compiled in, the Kyrandia resource loading
- # searches through it's entire index to find an mp3 each time a voice sample is requested
- # this causes a nasty pause.
-else
- ifdef DS_BUILD_E
- # TODO: Inherit the earth uses so much RAM that I have removed libmad in order to
- # claw some back.
-
-
- else
- USE_MAD = 1
- endif
-endif
-
-# Uncomment the following line to enable support for the
-# ace DS Debugger (remembering to make the same change in the arm7 makefile):
-#USE_DEBUGGER = 1
-
-# Uncomment the following line to enable the profiler
-#USE_PROFILER = 1
-
-# NOTE: The header and libs for the debugger is assumed to be in the libnds
-# folder.
-
-VPATH = $(srcdir)
-
-# Command to build libmad is:
-# ./configure --host=arm-elf --enable-speed --enable-sso -enable-fpm=arm CFLAGS='-specs=ds_arm9.specs -mthumb-interwork'
-
-USE_ARM_SOUND_ASM = 1
-ARM = 1
-
-ifdef DS_BUILD_A
- DEFINES = -DDS_SCUMM_BUILD -DDS_BUILD_A -DUSE_ARM_GFX_ASM
- LOGO = logoa.bmp
- DISABLE_HE = 1
- #DISABLE_SCUMM = 1
- DISABLE_SCUMM_7_8 = 1
- DISABLE_AGOS = 1
- DISABLE_SKY = 1
- DISABLE_SWORD1 = 1
- DISABLE_SWORD2 = 1
- DISABLE_QUEEN = 1
- DISABLE_SAGA = 1
- DISABLE_KYRA = 1
- DISABLE_GOB = 1
- DISABLE_LURE = 1
- DISABLE_CINE = 1
- DISABLE_AGI = 1
- DISABLE_TOUCHE = 1
- DISABLE_PARALLACTION = 1
- DISABLE_CRUISE = 1
- USE_ARM_GFX_ASM = 1
- DISABLE_CRUISE = 1
- DISABLE_DRASCULA = 1
- BUILD=scummvm-A
-endif
-
-ifdef DS_BUILD_B
- DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_B
- LOGO = logob.bmp
- DISABLE_HE = 1
- DISABLE_SCUMM = 1
- DISABLE_SCUMM_7_8 = 1
- DISABLE_AGOS = 1
- #DISABLE_SKY = 1
- DISABLE_SWORD1 = 1
- DISABLE_SWORD2 = 1
- #DISABLE_QUEEN = 1
- DISABLE_SAGA = 1
- DISABLE_KYRA = 1
- DISABLE_GOB = 1
- DISABLE_LURE = 1
- DISABLE_CINE = 1
- DISABLE_AGI = 1
- DISABLE_TOUCHE = 1
- DISABLE_PARALLACTION = 1
- DISABLE_CRUISE = 1
- DISABLE_DRASCULA = 1
- BUILD=scummvm-B
-endif
-
-ifdef DS_BUILD_C
- DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_C
- LOGO = logoc.bmp
- DISABLE_HE = 1
- DISABLE_SCUMM = 1
- DISABLE_SCUMM_7_8 = 1
- #DISABLE_AGOS = 1
- DISABLE_SKY = 1
- DISABLE_SWORD1 = 1
- DISABLE_SWORD2 = 1
- DISABLE_QUEEN = 1
- DISABLE_SAGA = 1
- DISABLE_KYRA = 1
- DISABLE_GOB = 1
- DISABLE_LURE = 1
- DISABLE_CINE = 1
- DISABLE_AGI = 1
- DISABLE_TOUCHE = 1
- DISABLE_PARALLACTION = 1
- DISABLE_CRUISE = 1
- DISABLE_DRASCULA = 1
- BUILD=scummvm-C
-endif
-
-ifdef DS_BUILD_D
- DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_D
- LOGO = logod.bmp
- DISABLE_HE = 1
- DISABLE_SCUMM = 1
- DISABLE_SCUMM_7_8 = 1
- DISABLE_AGOS = 1
- DISABLE_SKY = 1
- DISABLE_SWORD1 = 1
- DISABLE_SWORD2 = 1
- DISABLE_QUEEN = 1
- DISABLE_SAGA = 1
- DISABLE_KYRA = 1
- #DISABLE_GOB = 1
- DISABLE_LURE = 1
- #DISABLE_CINE = 1
- #DISABLE_AGI = 1
- DISABLE_TOUCHE = 1
- DISABLE_PARALLACTION = 1
- DISABLE_CRUISE = 1
- DISABLE_DRASCULA = 1
- BUILD=scummvm-D
-endif
-
-
-ifdef DS_BUILD_E
- DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_E
- LOGO = logoe.bmp
- DISABLE_HE = 1
- DISABLE_SCUMM = 1
- DISABLE_SCUMM_7_8 = 1
- DISABLE_AGOS = 1
- DISABLE_SKY = 1
- DISABLE_SWORD1 = 1
- DISABLE_SWORD2 = 1
- DISABLE_QUEEN = 1
- #DISABLE_SAGA = 1
- DISABLE_KYRA = 1
- DISABLE_GOB = 1
- DISABLE_LURE = 1
- DISABLE_CINE = 1
- DISABLE_AGI = 1
- DISABLE_TOUCHE = 1
- DISABLE_PARALLACTION = 1
- DISABLE_CRUISE = 1
- DISABLE_DRASCULA = 1
- BUILD=scummvm-E
-endif
-
-
-ifdef DS_BUILD_F
- DEFINES = -DDS_NON_SCUMM_BUILD -DDS_BUILD_F
- LOGO = logof.bmp
- DISABLE_HE = 1
- DISABLE_SCUMM = 1
- DISABLE_SCUMM_7_8 = 1
- DISABLE_AGOS = 1
- DISABLE_SKY = 1
- DISABLE_SWORD1 = 1
- DISABLE_SWORD2 = 1
- DISABLE_QUEEN = 1
- DISABLE_SAGA = 1
- #DISABLE_KYRA = 1
- DISABLE_GOB = 1
- DISABLE_LURE = 1
- DISABLE_CINE = 1
- DISABLE_AGI = 1
- DISABLE_TOUCHE = 1
- DISABLE_PARALLACTION = 1
- DISABLE_CRUISE = 1
- DISABLE_DRASCULA = 1
- BUILD=scummvm-F
-
-endif
-
-ARM7BIN := -7 $(CURDIR)/../../arm7/arm7.bin
-ICON := -b ../../../logo.bmp "ScummVM;By Neil Millstone;"
-
-CC = arm-eabi-gcc
-CXX = arm-eabi-g++
-
-CFLAGS = -Wno-multichar -Wall\
- -Wno-multichar -mcpu=arm9tdmi -mtune=arm9tdmi \
- -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer\
- -ffast-math -mthumb-interwork
-
-ifdef USE_DEBUGGER
- DEFINES += -DUSE_DEBUGGER
- CFLAGS += -g
-endif
-
-ifdef USE_PROFILER
- CFLAGS += -mpoke-function-name -finstrument-functions -g
- DEFINES += -DUSE_PROFILER
-endif
-
-CXXFLAGS= $(CFLAGS) -Wno-non-virtual-dtor -Wno-non-virtual-dtor \
- -fno-exceptions -fno-rtti
-
-ASFLAGS = -mcpu=arm9tdmi -mthumb-interwork
-DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DARM
-ifdef USE_MAD
- DEFINES += -DUSE_MAD
-endif
-
-
-LDFLAGS = -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt
-
-INCLUDES= -I./ -I$(portdir)/$(BUILD) -I$(srcdir) -I$(srcdir)/common -I$(portdir)/source -I$(portdir)/source/compressor -I$(portdir)/source/fat \
- -I$(srcdir)/backends/fs -I$(srcdir)/backends/fs/ds -I$(portdir)/data -I$(libndsdir)/include -I$(portdir)/../commoninclude\
- -I$(srcdir)/scumm -I$(libndsdir)/include -I$(libndsdir)/include/nds -I$(srcdir)/engines -I$(portdir)/source/mad\
- -I$(portdir)/source/libcartreset -include $(srcdir)/common/scummsys.h
-
-
-LIBS = -lm -L$(libndsdir)/lib -L$(portdir)/lib -lnds9
-ifdef USE_MAD
- LIBS += -lmad
-endif
-ifdef USE_DEBUGGER
- LIBS += -ldsdebugger -ldswifi9
-endif
-
-#-Lscumm -lscumm -Lbase -lbase -Lcommon -lcommon -Lgraphics -lgraphics -Lgui -lgui -Lsound -lsound
-EXECUTABLE = scummvm.elf
-PLUGIN_PREFIX =
-PLUGIN_SUFFIX = .plg
-PLUGIN_EXTRA_DEPS = plugin.x plugin.syms scummvm.elf
-PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,-Tplugin.x,--just-symbols,scummvm.elf,--retain-symbols-file,plugin.syms -L$(ronindir)/lib
-MKDIR = mkdir -p
-RM = rm -f
-RM_REC = rm -rf
-AR = arm-eabi-ar cru
-RANLIB = arm-eabi-ranlib
-OBJCOPY = arm-eabi-objcopy
-AS = arm-eabi-as
-HAVE_GCC3 = true
-DISABLE_SCALERS = true
-
-ifdef BUILD_PLUGINS
-DEFINES += -DDYNAMIC_MODULES
-PRE_OBJS_FLAGS = -Wl,--whole-archive
-POST_OBJS_FLAGS = -Wl,--no-whole-archive
-endif
-
-PORT_OBJS := $(portdir)/source/blitters_arm.o $(portdir)/source/cdaudio.o $(portdir)/source/dsmain.o \
- $(portdir)/../../../fs/ds/ds-fs.o $(portdir)/source/gbampsave.o $(portdir)/source/scummhelp.o\
- $(portdir)/source/osystem_ds.o $(portdir)/source/portdefs.o $(portdir)/source/ramsave.o\
- $(portdir)/source/scummconsole.o $(portdir)/source/touchkeyboard.o $(portdir)/source/zipreader.o\
- $(portdir)/source/dsoptions.o $(portdir)/source/keys.o $(portdir)/source/wordcompletion.o
-
-ifdef USE_PROFILER
- PORT_OBJS += $(portdir)/source/profiler/cyg-profile.o
-endif
-
-
-DATA_OBJS := $(portdir)/data/icons.o $(portdir)/data/keyboard.o $(portdir)/data/keyboard_pal.o $(portdir)/data/default_font.o $(portdir)/data/8x8font_tga.o
-
-
-COMPRESSOR_OBJS := $(portdir)/source/compressor/lz.o
-
-FAT_OBJS := $(portdir)/source/fat/disc_io.o $(portdir)/source/fat/gba_nds_fat.o\
- $(portdir)/source/fat/io_fcsr.o $(portdir)/source/fat/io_m3cf.o\
- $(portdir)/source/fat/io_mpcf.o $(portdir)/source/fat/io_sccf.o\
- $(portdir)/source/fat/io_m3sd.o\
- $(portdir)/source/fat/io_nmmc.o $(portdir)/source/fat/io_scsd.o \
- $(portdir)/source/fat/io_scsd_asm.o \
- $(portdir)/source/fat/io_njsd.o \
- $(portdir)/source/fat/io_mmcf.o \
- $(portdir)/source/fat/io_sd_common.o \
- $(portdir)/source/fat/io_m3_common.o \
- $(portdir)/source/fat/io_dldi.o \
- $(portdir)/source/fat/m3sd.o
-
-
-# $(portdir)/source/fat/io_cf_common.o $(portdir)/source/fat/io_m3_common.o\
-# $(portdir)/source/fat/io_sd_common.o $(portdir)/source/fat/io_scsd_s.o \
-# $(portdir)/source/fat/io_sc_common.o $(portdir)/source/fat/io_sd_common.o
-
-LIBCARTRESET_OBJS := $(portdir)/source/libcartreset/cartreset.o
-
-# Files in this list will be compiled with -O2, otherwise they will be compiled with -Os
-OPTLIST := actor.cpp ds_main.cpp osystem_ds.cpp blitters.cpp fmopl.cpp rate.cpp mixer.cpp
-#OPTLIST :=
-
-OBJS := $(DATA_OBJS) $(LIBCARTRESET_OBJS) $(PORT_OBJS) $(COMPRESSOR_OBJS) $(FAT_OBJS)
-
-
-
-MODULE_DIRS += .
-
-ndsall:
- @[ -d $(BUILD) ] || mkdir -p $(BUILD)
- make -C ./$(BUILD) -f ../makefile scummvm.nds
-
-include $(srcdir)/Makefile.common
-
-clean:
- $(RM) $(OBJS) $(EXECUTABLE)
- rm -fr $(BUILD)
-
-plugin_dist :
- find . -name '*.plg' | while read p; do \
- sh-elf-strip -g -o "`basename \"$$p\" | tr '[:lower:]' '[:upper:]'`" "$$p"; \
- done
-
-dist : SCUMMVM.BIN plugins plugin_dist
-
-
-#---------------------------------------------------------------------------------
-# canned command sequence for binary data
-#---------------------------------------------------------------------------------
-#define bin2o
-# bin2s $< | $(AS) -mthumb -mthumb-interwork -o $(@)
-# echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_raw_end[];" > `(echo $(<F) | tr . _)`.h
-# echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_raw[];" >> `(echo $(<F) | tr . _)`.h
-# echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_raw_size";" >> `(echo $(<F) | tr . _)`.h
-#endef
-
-
-define bin2o
- bin2s $< | $(AS) -mthumb -mthumb-interwork -o $(@)
- echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
- echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
- echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
-endef
-
-
-#define bin2o
-# @echo $(*)
-# cp $(<) $(*).tmp
-# $(OBJCOPY) -I binary -O elf32-littlearm -B arm \
-# --rename-section .data=.rodata \
-# --redefine-sym _binary_$(subst .,_,$(subst /,_,$(*)))_tmp_start=$(notdir $*)\
-# --redefine-sym _binary_$(subst .,_,$(subst /,_,$(*)))_tmp_end=$(notdir $*)_end\
-# $(*).tmp $(@)
-# echo "extern const u8" $(notdir $*)"[] __attribute__ ((aligned (4)));" > $(*).h
-# echo "extern const u32" $(notdir $(*))_size[]";" >> $(*).h
-#
-# echo $(*).h
-# rm $(*).tmp
-#endef
-
-
-##############
-# Replacement rule for the one in makefile.common
-##############
-ifndef HAVE_GCC3
-# If you use GCC, disable the above and enable this for intelligent
-# dependency tracking.
-.cpp.o:
-
- $(MKDIR) $(*D)/$(DEPDIR)
- $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-# $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
- $(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
- $(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
-else
-# If you even have GCC 3.x, you can use this build rule, which is safer; the above
-# rule can get you into a bad state if you Ctrl-C at the wrong moment.
-# Also, with this GCC inserts additional dummy rules for the involved headers,
-# which ensures a smooth compilation even if said headers become obsolete.
-.cpp.o:
-# echo !!!!!!!!!!!! $(notdir $<)
-# ifeq ( $(notdir $<), $(findstring $(notdir $<), $(OPTLIST)) )
-# OPTFLAG=-O3
-# else
-# OPTFLAG=-Os
-# endif
-
-# export OPTFLAG = ;
-# echo !!!!!!!! $(OPTFLAG)
-
- $(MKDIR) $(*D)/$(DEPDIR)
- $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
- $(CXX) -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o $(if $(findstring $(notdir $<), $(OPTLIST)), -O2, -Os)
-endif
-
-
-#---------------------------------------------------------------------------------
-
-#---------------------------------------------------------------------------------
-%.o : %.pcx
-#---------------------------------------------------------------------------------
- @echo $(notdir $<)
- @$(bin2o)
-
-#---------------------------------------------------------------------------------
-%.o : %.bin
-#---------------------------------------------------------------------------------
- @echo $(notdir $<)
- @$(bin2o)
-
-#---------------------------------------------------------------------------------
-%.o : %.raw
-#---------------------------------------------------------------------------------
- @echo $(notdir $<)
- @$(bin2o)
-
-#---------------------------------------------------------------------------------
-%.o : %.pal
-#---------------------------------------------------------------------------------
- @echo $(notdir $<)
- @$(bin2o)
-
-#---------------------------------------------------------------------------------
-%.o : %.map
-#---------------------------------------------------------------------------------
- @echo $(notdir $<)
- @$(bin2o)
-
-#---------------------------------------------------------------------------------
-%.o : %.mdl
-#---------------------------------------------------------------------------------
- @echo $(notdir $<)
- @$(bin2o)
-
-#---------------------------------------------------------------------------------
-%.nds: %.bin
- @echo ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM @VERSION@;DS Port"
- ndstool -c $@ -9 scummvm.bin $(ARM7BIN) -b ../../$(LOGO) "$(shell basename $@);ScummVM @VERSION@;DS Port"
- dsbuild $@ -l ../ndsloader.bin
-
- padbin 16 $(basename $@).ds.gba
-
-#---------------------------------------------------------------------------------
-%.bin: %.elf
- $(OBJCOPY) -S scummvm.elf scummvm-stripped.elf
- $(OBJCOPY) -O binary scummvm-stripped.elf scummvm.bin
-
-#%.o: %.s
-# $(MKDIR) $(*D)/$(DEPDIR)
-# $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-
Deleted: scummvm/trunk/dists/iphone/Info.plist
===================================================================
--- scummvm/trunk/dists/iphone/Info.plist 2007-12-16 21:35:15 UTC (rev 29888)
+++ scummvm/trunk/dists/iphone/Info.plist 2007-12-16 21:41:10 UTC (rev 29889)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>en</string>
- <key>CFBundleExecutable</key>
- <string>ScummVM</string>
- <key>CFBundleIdentifier</key>
- <string>org.scummvm.scummvm</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>ScummVM</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleShortVersionString</key>
- <string>0.11.0svn</string>
- <key>CFBundleVersion</key>
- <string>svn</string>
-</dict>
-</plist>
Deleted: scummvm/trunk/dists/macosx/Info.plist
===================================================================
--- scummvm/trunk/dists/macosx/Info.plist 2007-12-16 21:35:15 UTC (rev 29888)
+++ scummvm/trunk/dists/macosx/Info.plist 2007-12-16 21:41:10 UTC (rev 29889)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleDisplayName</key>
- <string>ScummVM</string>
- <key>CFBundleExecutable</key>
- <string>scummvm</string>
- <key>CFBundleGetInfoString</key>
- <string>0.11.0svn, Copyright 2001-2007 The ScummVM team</string>
- <key>CFBundleIconFile</key>
- <string>scummvm.icns</string>
- <key>CFBundleIdentifier</key>
- <string>org.scummvm.scummvm</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>ScummVM</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>0.11.0svn</string>
- <key>CFBundleVersion</key>
- <string>0.11.0svn</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
- <key>NSHumanReadableCopyright</key>
- <string>Copyright 2001-2007 The ScummVM team</string>
-</dict>
-</plist>
Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk 2007-12-16 21:35:15 UTC (rev 29888)
+++ scummvm/trunk/ports.mk 2007-12-16 21:41:10 UTC (rev 29889)
@@ -24,10 +24,6 @@
rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
rm -rf "$(DESTDIR)$(DATADIR)/scummvm/"
-dist:
- $(RM) $(ZIPFILE)
- $(ZIP) $(ZIPFILE) $(DISTFILES)
-
deb:
ln -sf dists/debian;
debian/prepare
@@ -36,7 +32,7 @@
# Special target to create a application wrapper for Mac OS X
bundle_name = ScummVM.app
-bundle: scummvm-static
+bundle: scummvm-static $(srcdir)/dists/macosx/Info.plist
mkdir -p $(bundle_name)/Contents/MacOS
mkdir -p $(bundle_name)/Contents/Resources
echo "APPL????" > $(bundle_name)/Contents/PkgInfo
@@ -52,7 +48,7 @@
$(srcdir)/tools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf
strip $(bundle_name)/Contents/MacOS/scummvm
-iphonebundle:
+iphonebundle: $(srcdir)/dists/iphone/Info.plist
mkdir -p $(bundle_name)
cp $(srcdir)/dists/iphone/Info.plist $(bundle_name)/
cp $(srcdir)/gui/themes/modern.ini $(bundle_name)/
@@ -178,4 +174,4 @@
cp README $(AOS4PATH)/README.txt
cp /sdk/local/documentation/SDL-1.2.9/README-SDL.txt $(AOS4PATH)
-.PHONY: deb bundle osxsnap win32dist dist install uninstall
+.PHONY: deb bundle osxsnap win32dist install uninstall
Modified: scummvm/trunk/tools/update-version.pl
===================================================================
--- scummvm/trunk/tools/update-version.pl 2007-12-16 21:35:15 UTC (rev 29888)
+++ scummvm/trunk/tools/update-version.pl 2007-12-16 21:41:10 UTC (rev 29889)
@@ -31,10 +31,7 @@
# List of the files in which we need to perform substitution.
my @subs_files = qw(
- backends/platform/ds/arm9/makefile
base/internal_version.h
- dists/iphone/Info.plist
- dists/macosx/Info.plist
dists/redhat/scummvm.spec
dists/scummvm.rc
dists/slackware/scummvm.SlackBuild
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