[Scummvm-cvs-logs] CVS: scummvm Makefile.noconf,NONE,1.1 NEWS,1.32,1.33 Makefile,1.40,1.41 Makefile.new,1.8,NONE
Jonathan Gray
khalek at users.sourceforge.net
Sat Aug 9 23:57:06 CEST 2003
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv19093
Modified Files:
NEWS Makefile
Added Files:
Makefile.noconf
Removed Files:
Makefile.new
Log Message:
Makefile.new -> Makefile, Makefile -> Makefile.noconf default Makefile now requires configure script
--- NEW FILE: Makefile.noconf ---
# $Header: /cvsroot/scummvm/scummvm/Makefile.noconf,v 1.1 2003/08/10 06:56:53 khalek Exp $
CXX := c++
AR := ar cru
RANLIB := 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
#######################################################################
# Default compilation parameters. Normally don't edit these #
#######################################################################
CXXFLAGS:= -g -O
DEFINES :=
LDFLAGS :=
INCLUDES:= -I. -Icommon
LIBS :=
OBJS :=
# Turn on useful warnings
CXXFLAGS+= -Wall -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
CXXFLAGS+= -Wshadow -Wstrict-prototypes -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
# Seems GCC 2.95 doesn't support the following, so we do not yet turn them
# on by default (but I'd strongly recommend to all GCC 2.95 users to update
# to a better compiler like GCC 3.x).
# CXXFLAGS+= -ansi -W -Wno-unused-parameter -Woverloaded-virtual -Wdisabled-optimization -Wfloat-equal
# The following causes problems on some systems where the system header
# contain duplicate declarations already. That's really a bug in the
# system headers, but since it causes lots of warnings on those systems,
# we don't enable it by default
#CXXFLAGS+= -Wredundant-decls
# Load the build rules & settings for the chosen backend
-include build.rules
#######################################################################
# Compile options - you can modify these to tweak ScummVM compilation #
#######################################################################
# Uncomment this to activate the MAD lib for compressed sound files
DEFINES += -DUSE_MAD
LIBS += -lmad
# Uncomment this to activate the Ogg Vorbis lib for compressed sound files
# DEFINES += -DUSE_VORBIS
# LIBS += -lvorbisfile -lvorbis
# Uncomment this to activate the ALSA lib for midi
# DEFINES += -DUSE_ALSA
# LIBS += -lasound
# Uncomment this to cause warnings to be treated as errors
# CXXFLAGS+= -Werror
# Uncomment this to use GCC 3.x specific dependency tracking (recommended)
# HAVE_GCC3 = 1
#######################################################################
# Control which modules are built - uncomment any to disable module #
#######################################################################
# DISABLE_SCUMM = 1
# DISABLE_SIMON = 1
# DISABLE_SKY = 1
DISABLE_SWORD2 = 1
#######################################################################
# Misc stuff - you should normally never have to edit this #
#######################################################################
include Makefile.common
dist:
$(RM) $(ZIPFILE)
$(ZIP) $(ZIPFILE) $(DISTFILES)
# Until we add a nice configure tool, default to the SDL build rules
build.rules:
$(CP) backends/sdl/build.rules build.rules
deb:
ln -sf dists/debian;
debian/prepare
fakeroot debian/rules binary
# Special target to create a application wrapper for Mac OS X
bundle_name = ScummVM.app
bundle: scummvm-static
mkdir -p $(bundle_name)/Contents/MacOS
mkdir -p $(bundle_name)/Contents/Resources
echo "APPL????" > $(bundle_name)/Contents/PkgInfo
cp Info.plist $(bundle_name)/Contents/
cp scummvm.icns $(bundle_name)/Contents/Resources/
cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
strip $(bundle_name)/Contents/MacOS/scummvm
# Special target to create a static linked binary for Mac OS X
scummvm-static: $(OBJS)
$(CXX) $(LDFLAGS) -o scummvm-static $(OBJS) \
/sw/lib/libSDLmain.a /sw/lib/libSDL.a \
/sw/lib/libmad.a \
/sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a \
-framework Cocoa -framework Carbon -framework IOKit \
-framework OpenGL -framework AGL -framework QuickTime \
-framework AudioUnit -framework AudioToolbox
.PHONY: deb bundle
Index: NEWS
===================================================================
RCS file: /cvsroot/scummvm/scummvm/NEWS,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- NEWS 8 Aug 2003 13:13:37 -0000 1.32
+++ NEWS 10 Aug 2003 06:56:53 -0000 1.33
@@ -7,6 +7,7 @@
- Rewrote sound mixer, and several iMUSE bugs fixed
- Adlib GM emulation table revamped, providing more accurate software MIDI
- Added full and partial sound looping to Zak McKracken FmTowns
+- Default Makefile now uses configure script, old one is Makefile.noconf
0.5.1 (2003-08-06)
- Rewrote Beneath a Steel Sky savegame code (see note in READMEs 'Known Bugs')
Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Makefile 2 Aug 2003 09:21:34 -0000 1.40
+++ Makefile 10 Aug 2003 06:56:53 -0000 1.41
@@ -17,64 +17,23 @@
# Default compilation parameters. Normally don't edit these #
#######################################################################
-CXXFLAGS:= -g -O
-DEFINES :=
+DEFINES := -DHAVE_CONFIG_H
LDFLAGS :=
INCLUDES:= -I. -Icommon
LIBS :=
OBJS :=
-# Turn on useful warnings
-CXXFLAGS+= -Wall -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
-CXXFLAGS+= -Wshadow -Wstrict-prototypes -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
-
-# Seems GCC 2.95 doesn't support the following, so we do not yet turn them
-# on by default (but I'd strongly recommend to all GCC 2.95 users to update
-# to a better compiler like GCC 3.x).
-# CXXFLAGS+= -ansi -W -Wno-unused-parameter -Woverloaded-virtual -Wdisabled-optimization -Wfloat-equal
-
-# The following causes problems on some systems where the system header
-# contain duplicate declarations already. That's really a bug in the
-# system headers, but since it causes lots of warnings on those systems,
-# we don't enable it by default
-#CXXFLAGS+= -Wredundant-decls
-
-# Load the build rules & settings for the chosen backend
--include build.rules
-
-#######################################################################
-# Compile options - you can modify these to tweak ScummVM compilation #
-#######################################################################
-
-# Uncomment this to activate the MAD lib for compressed sound files
-DEFINES += -DUSE_MAD
-LIBS += -lmad
-
-# Uncomment this to activate the Ogg Vorbis lib for compressed sound files
-# DEFINES += -DUSE_VORBIS
-# LIBS += -lvorbisfile -lvorbis
-
-# Uncomment this to activate the ALSA lib for midi
-# DEFINES += -DUSE_ALSA
-# LIBS += -lasound
-
-# Uncomment this to cause warnings to be treated as errors
-# CXXFLAGS+= -Werror
-
-# Uncomment this to use GCC 3.x specific dependency tracking (recommended)
-# HAVE_GCC3 = 1
-
-#######################################################################
-# Control which modules are built - uncomment any to disable module #
-#######################################################################
+# Load the make rules generated by configure
+include config.mak
-# DISABLE_SCUMM = 1
-# DISABLE_SIMON = 1
-# DISABLE_SKY = 1
-DISABLE_SWORD2 = 1
+# Uncomment this for stricter compile time code verification
+# CXXFLAGS+= -Wshadow -Werror
+CXXFLAGS:= -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas $(CXXFLAGS)
+# Even more warnings...
+CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
+CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor
+CXXFLAGS+= -Wno-reorder -Wwrite-strings -fcheck-new -Wctor-dtor-privacy
#######################################################################
# Misc stuff - you should normally never have to edit this #
@@ -86,15 +45,12 @@
$(RM) $(ZIPFILE)
$(ZIP) $(ZIPFILE) $(DISTFILES)
-# Until we add a nice configure tool, default to the SDL build rules
-build.rules:
- $(CP) backends/sdl/build.rules build.rules
-
deb:
ln -sf dists/debian;
debian/prepare
fakeroot debian/rules binary
+
# Special target to create a application wrapper for Mac OS X
bundle_name = ScummVM.app
bundle: scummvm-static
@@ -109,9 +65,7 @@
# Special target to create a static linked binary for Mac OS X
scummvm-static: $(OBJS)
$(CXX) $(LDFLAGS) -o scummvm-static $(OBJS) \
- /sw/lib/libSDLmain.a /sw/lib/libSDL.a \
- /sw/lib/libmad.a \
- /sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a \
+ /sw/lib/libSDLmain.a /sw/lib/libSDL.a /sw/lib/libmad.a \
-framework Cocoa -framework Carbon -framework IOKit \
-framework OpenGL -framework AGL -framework QuickTime \
-framework AudioUnit -framework AudioToolbox
--- Makefile.new DELETED ---
More information about the Scummvm-git-logs
mailing list