From 4bc7265b03273e1c68b4124b4aeeebfadddcbd7e Mon Sep 17 00:00:00 2001 From: bjarni Date: Tue, 6 Dec 2005 22:09:28 +0000 Subject: (svn r3267) -Codechange: [OSX] universal binary makefile code cleanup now PPC code is always compiled before x86 code strgen and lng files are only compiled once, which results in shorter building time the makefile now assigns default values to undefined values so much less needs to be set up the code is now easier to maintain --- Makefile | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 075768d3f..1c544d505 100644 --- a/Makefile +++ b/Makefile @@ -170,19 +170,6 @@ ifndef SDL-CONFIG CONFIG_INCLUDED:= endif -ifdef UNIVERSAL_OTHER_HALF - ifndef CC_HOST - # we are crosscompiling, so we should remember what compiler we should use for strgen - CC_HOST = $(CC) - endif - CC_TARGET = $(CC_UNI) - CFLAGS = $(CFLAGS_UNI) - LDFLAGS = $(LDFLAGS_UNI) - SDL-CONFIG = $(SDL-CONFIG_UNI) - LIBPNG-CONFIG = $(LIBPNG-CONFIG_UNI) - LIBS:= -endif - # this is used if there aren't any Makefile.config ifndef CONFIG_INCLUDED # sets network on by default if there aren't any config file @@ -203,6 +190,10 @@ ifdef SUPRESS_LANG_ERRORS LANG_ERRORS = >/dev/null 2>&1 endif +ifdef OSX +-include os/MacOSX/Makefile.setup +endif + ifdef STATIC ifndef WIN32 ifndef OSX @@ -215,14 +206,6 @@ endif endif endif -ifdef OSX -ifdef RELEASE -# all OSX releases needs to be static -# end users don't tend to have the dynamic libs installed -$(warning Compiling a dynamic release. It should be static unless you really know what you are doing!!!) -endif -endif - # Force SDL on UNIX platforms ifndef WITH_SDL ifdef UNIX -- cgit v1.2.3-54-g00ecf