diff options
| -rw-r--r-- | Makefile.new | 74 | ||||
| -rwxr-xr-x | configure | 17 |
2 files changed, 90 insertions, 1 deletions
diff --git a/Makefile.new b/Makefile.new new file mode 100644 index 0000000000..459b2b5249 --- /dev/null +++ b/Makefile.new @@ -0,0 +1,74 @@ +# $Header$ + +include config.mak + +# 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 -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas +DEFINES := -DHAVE_CONFIG_H +LDFLAGS := +INCLUDES:= -I. -Icommon +# LIBS := +OBJS := + +# Load the build rules & settings for the chosen backend +-include build.rules + +# Uncomment this for stricter compile time code verification +# CXXFLAGS+= -Wshadow -Werror + + +####################################################################### +# 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 \ + -framework Cocoa -framework Carbon -framework IOKit \ + -framework OpenGL -framework AGL -framework QuickTime \ + -framework AudioUnit -framework AudioToolbox + +.PHONY: deb bundle @@ -29,6 +29,7 @@ _alsa=auto _build_scumm=yes _build_simon=yes _build_sky=yes +_need_memalign=no # binary names _ranlib=ranlib @@ -258,6 +259,20 @@ case $endianess in esac rm -f tmp_endianess_check tmp_endianess_check.cpp +echo -n "Alignment required... " +cat > $TMPC << EOF +#include <malloc.h> +int main (void) { (void) memalign(64, sizeof(char)); return 0; } +EOF +_need_memalign=yes +cc_check && _need_memalign=no +if test "$_need_memalign" = yes ; then + echo "#define SCUMM_NEED_ALIGNMENT" >> config.h +else + echo "#undef SCUMM_NEED_ALIGNMENT" >> config.h +fi +echo "$_need_memalign" + # # Determine data type sizes # TODO: proper error checking @@ -298,7 +313,7 @@ EOF fi if test "$_vorbis" = yes ; then echo "#define USE_VORBIS" >> config.h - LIBS="$LIBS -lvorbisfile -lvorbis" + LIBS="$LIBS -lvorbisfile -lvorbis -logg" else echo "#undef USE_VORBIS" >> config.h fi |