Changeset 429

Timestamp:

08/06/06 07:08:36 (4 years ago)

Author:

vasi

Message:

make settings depend on sdk

Location:

xmoto/trunk

Files:

• . (modified) (1 prop)
• Makefile (modified) (11 diffs)

xmoto/trunk

@@ -19 +19 @@
 xmoto-universal
 xmoto.bin
+xmoto

@@ -19 +19 @@
 xmoto-universal
 xmoto.bin
+xmoto

xmoto/trunk/Makefile

@@ -1 +1 @@
 ##### SETTINGS #####
 
-LIBS_i386 = SDLmain jpeg png lua ode
-LIBS_ppc = $(LIBS_i386) bz2 curl
+BASE_LIBS = SDLmain jpeg png lua ode
 
 SDK_i386 = 10.4
 SDK_ppc = 10.2
+#SDK_ppc = 10.3
 
 TAG = V_0_2_0
 VERSION = 0.2.0
 
-#CCOPT = -O2
-CCOPT = -O0 -g
+CCOPT = -O2
+#CCOPT = -O0 -g
+
 
 ##### VARIABLES #####
@@ -18 +19 @@
 
 FRAMEWORKS_DIR = /Library/Frameworks
+vpath %.framework $(FRAMEWORKS_DIR)
+
 DOWNLOAD = curl -o $@ 
 
+# Makefile rebuilding and recursion
 ifndef ORIG_DIR
     export ORIG_DIR = $(shell pwd)
@@ -27 +31 @@
 endif
 
-vpath %.framework $(FRAMEWORKS_DIR)
+
+##### BUILD VARS #####
 
 ifdef ARCH
@@ -33 +38 @@
                 null =
                 export PREFIX = /xmoto-$(ARCH)
-                SDK_VERS = $(SDK_$(ARCH))
-                SDK = $(wildcard /Developer/SDKs/MacOSX$(SDK_VERS)*.sdk)
-                ifeq ($(firstword $(sort 10.3 $(SDK_VERS))),10.3)
+                export SDK_VERS = $(SDK_$(ARCH))
+        endif
+endif
+
+# Vars MIN_10x for "at least version 10.x of OS X"
+MINOR_VERS = $(subst 10.,,$(SDK_VERS))
+$(if $(SDK_VERS),\
+        $(foreach mv,1 2 3 4 5 6 7 8 9,\
+                $(if $(subst $(mv),,$(firstword $(sort $(mv) $(MINOR_VERS)))),,\
+                        $(eval export MIN_10$(mv) = 1)))\
+,)
+
+ifdef ARCH
+        ifndef SDK
+                export SDK = $(wildcard /Developer/SDKs/MacOSX$(SDK_VERS)*.sdk)
+                export BUILDFLAGS = 1
+                ifdef MIN_103
                         GCC_VERSION = 4.0
                         GCC_OPT_SEP = $(null) $(null) 
@@ -49 +68 @@
                 export CXX = g++-$(GCC_VERSION)
                 export HOST = $(ARCH)-apple-darwin
+        endif
+        
+    ARCH_LIBS := $(BASE_LIBS)
+    ifndef MIN_103
+        ARCH_LIBS += curl bz2
     endif
-    LIBS = $(patsubst %,lib%.a,$(LIBS_$(ARCH)))
+    LIBS = $(patsubst %,lib%.a,$(ARCH_LIBS))
     vpath lib%.a $(PREFIX)/lib
 endif
@@ -112 +136 @@
 ifdef ARCH
     xmoto_PREREQ = $(LIBS) $(FRAMEWORKS)
-    xmoto_COMMAND = $(MAKE) unpack-xmoto
+    xmoto_COMMAND = $(MAKE) pre-mod-xmoto
 else
     xmoto_COMMAND = ARCH=$* $(MAKE) $@
@@ -142 +166 @@
 
 lib%.a:
-        $(MAKE) unpack-$*
+        $(MAKE) pre-mod-$*
         ranlib $(PREFIX)/lib/lib$*.a
 
-unpack-%:
-        SUBDIR=$* UNPACK=$* $(MAKE) env-$*
-
-env-%:
-        $(MAKE) real-unpack-$*
-
-real-unpack-%:
+pre-mod-%:
+        SUBDIR=$* UNPACK=$* $(MAKE) mod-$*
+
+mod-%:
+        $(MAKE) real-$*
+
+real-%:
         [ x$$MANUAL = x ] || (cd $(SUBDIR) && bash && false)
         $(MAKE) $(UNPACK)
@@ -159 +183 @@
 ##### PACKAGE SPECIFIC #####
 
-unpack-SDLmain: SDL.framework
-        SUBDIR=SDL/devel-lite UNPACK=SDL $(MAKE) env-SDLmain
+mod-SDLmain: SDL.framework
+        SUBDIR=SDL/devel-lite UNPACK=SDL $(MAKE) real-SDLmain
 
 build-SDLmain:
@@ -173 +197 @@
         make install PREFIX=$(PREFIX)
 
-env-curl:
+mod-curl:
         CFLAGS="$(CFLAGS) -DCURL_DISABLE_NTLM" LDFLAGS="$(SYSLIBROOT)" \
-                $(MAKE) real-unpack-curl
+                $(MAKE) real-curl
 
 build-curl:
@@ -199 +223 @@
         make install INSTALL_TOP=$(PREFIX)
 
-unpack-ode:
-        SUBDIR=ode/ode-0.6 UNPACK=ode $(MAKE) env-ode
+mod-ode:
+        SUBDIR=ode/ode-0.6 UNPACK=ode $(MAKE) real-ode
 
 build-ode:
@@ -213 +237 @@
 
 
+FRAMEWORKS_LINK = $(shell echo $(FRAMEWORKS) \
+        | perl -pe 's,(\S*)\.\S*,$(FRAMEWORKS_DIR)/$$&/$$1,g')
+
 xmoto_CFLAGS := $(CFLAGS) -I$(PREFIX)/include \
     $(patsubst %,-I%/Headers,$(FRAMEWORKS_PATHS))
 xmoto_CXXFLAGS := $(xmoto_CFLAGS) -fpermissive
-xmoto_LDFLAGS := -L$(PREFIX)/lib -framework Cocoa -lz -lssl \
-        $(shell echo $(FRAMEWORKS) | perl -pe 's,(\S*)\.\S*,$(FRAMEWORKS_DIR)/$$&/$$1,g')
-ifeq ($(ARCH),i386)
-    xmoto_LDFLAGS += -lgcc_eh
-endif
-
-unpack-xmoto:
-        SUBDIR=xmoto-cvs UNPACK=xmoto-cvs $(MAKE) env-xmoto
-
-env-xmoto:
-        CFLAGS="$(xmoto_CFLAGS)" CXXFLAGS="$(xmoto_CXXFLAGS)" \
-                LDFLAGS="$(xmoto_LDFLAGS)" $(MAKE) real-unpack-xmoto
+xmoto_LDFLAGS := -L$(PREFIX)/lib -framework Cocoa $(FRAMEWORKS_LINK) -lz
+ifdef MIN_103
+        xmoto_LDFLAGS += -lgcc_eh
+else
+        xmoto_LDFLAGS += -lssl
+endif
+
+mod-xmoto:
+        SUBDIR=xmoto-cvs UNPACK=xmoto-cvs \
+                CFLAGS="$(xmoto_CFLAGS)" CXXFLAGS="$(xmoto_CXXFLAGS)" \
+                LDFLAGS="$(xmoto_LDFLAGS)" \
+                $(MAKE) real-xmoto
 
 build-xmoto:

@@ -19 +19 @@
 xmoto-universal
 xmoto.bin
+xmoto