From 02c70180fa8fb570e0dbf98cfe8c2e8159682f90 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Thu, 4 Mar 2004 23:25:10 +0000 Subject: remove Makefile.noconf there isn't any known reason for people to use it now svn-id: r13193 --- Makefile.noconf | 133 -------------------------------------------------------- TODO | 8 +--- 2 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 Makefile.noconf diff --git a/Makefile.noconf b/Makefile.noconf deleted file mode 100644 index 805090355a..0000000000 --- a/Makefile.noconf +++ /dev/null @@ -1,133 +0,0 @@ -# $Header$ - -CXX := c++ -AR := ar cru -RANLIB := ranlib -MKDIR := mkdir -p -ECHO := echo -n -CAT := cat -RM := rm -f -RM_REC := $(RM) -r -ZIP := zip -q -CP := cp - -####################################################################### -# Default compilation parameters. Normally don't edit these # -####################################################################### - -srcdir ?= . - -CXXFLAGS:= -g -O -DEFINES := -LDFLAGS := -INCLUDES:= -I$(srcdir) -I$(srcdir)/common -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 MPEG2 lib for Broken Sword II cut scenes -# DEFINES += -DUSE_MPEG2 -# LIBS += -lmpeg2 - -# Uncomment this to activate the ZLIB lib for compressed save game files -# DEFINES += -DUSE_ZLIB -# LIBS += -lz - -# 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_SWORD1 = 1 -# DISABLE_SWORD2 = 1 -# DISABLE_QUEEN = 1 - - -####################################################################### -# Misc stuff - you should normally never have to edit this # -####################################################################### - -EXECUTABLE := scummvm$(EXEEXT) - -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 \ - /sw/lib/libmpeg2.a \ - -lz \ - -framework Cocoa -framework Carbon -framework IOKit \ - -framework OpenGL -framework AGL -framework QuickTime \ - -framework AudioUnit -framework AudioToolbox - -.PHONY: deb bundle diff --git a/TODO b/TODO index 5a8313a9c2..68a26370a4 100644 --- a/TODO +++ b/TODO @@ -52,14 +52,8 @@ Build System include $(srcdir)/Makefile * Allow automatic re-runs of configure (this would have to 'save' the values of env vars like CXXFLAGS and also command line params) -* It would be nice to get rid of Makefile.noconf (so that we can implement - certain improvements which aren't possible as long as we have to maintain - that). To this end, find out - 1) Which platforms/systems require Makefile.noconf? - 2) What stops them from using 'configure' ? Document this! - 3) If possible fix all the issue listed in 2) * Add an install target to the Makefile - Copy binary, install manpage, add - menu items. See also patch #891909 (Gnome/KDE .desktop file) + menu items, install README. See also patch #891909 (Gnome/KDE .desktop file) Documentation ============= -- cgit v1.2.3