]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
./all compile agl: set -arch i386
authorRudolf Polzer <divverent@alientrap.org>
Sun, 31 Oct 2010 13:20:55 +0000 (14:20 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 31 Oct 2010 13:20:55 +0000 (14:20 +0100)
all

diff --git a/all b/all
index 1e4f651b2adc7fc7e1c18021516e7ab0aa125bf2..b73d5f1bc61c033269e82a15408973069b076d39 100755 (executable)
--- a/all
+++ b/all
@@ -704,6 +704,7 @@ case "$cmd" in
                cleanqc=false
                compiled0=false
                debug=debug
+               snowleopardhack=false
                if [ -z "$CC" ]; then
                        export CC="gcc -DSUPPORTIPV6"
                fi
@@ -739,6 +740,7 @@ case "$cmd" in
                                        ;;
                                *)
                                        # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
+                                       snowleopardhack=true
                                        TARGETS="sv-$debug sdl-$debug"
                                        ;;
                        esac
@@ -760,7 +762,13 @@ case "$cmd" in
                                        sdl)
                                                TARGETS="$TARGETS sdl-debug"
                                                ;;
-                                       glx|agl|wgl)
+                                       agl)
+                                               TARGETS="$TARGETS cl-debug"
+                                               if $snowleopardhack; then
+                                                       export CC="$CC -arch i386"
+                                               fi
+                                               ;;
+                                       glx|wgl)
                                                TARGETS="$TARGETS cl-debug"
                                                ;;
                                        dedicated)