Universal binary support in build system. Sorta duct-taped, but whatever.

diff --git a/makefile b/makefile
index 542bb594dfcf1dd59f28ce5a79f7641a7f6c39af..54b17068223753cde0f8a529d93f6e62eba12472 100644 (file)
--- a/makefile
+++ b/makefile
@@ -15,7 +15,18 @@ GLUDIR := GLU
 LIBOGGDIR := libogg-1.0
 LIBVORBISDIR := libvorbis-1.0.1
 
-EXE := $(RUNDIR)/lugaru-bin
+
+ifeq ($(strip $(macosx_arch)),)
+  macosx_arch := i386
+endif
+
+ifeq ($(strip $(macosx)),true)
+   EXEEXT := $(macosx_arch)
+else
+   EXEEXT := bin
+endif
+
+EXE := $(RUNDIR)/lugaru-$(EXEEXT)
 
 ifeq ($(strip $(macosx)),true)
        CXX := g++-4.0
@@ -66,7 +77,6 @@ ifeq ($(strip $(macosx)),true)
   CFLAGS += -mdynamic-no-pic
   LDFLAGS := -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework Carbon -framework OpenAL
   APPLDFLAGS := ./libSDL-1.2.0.dylib ./libSDLmain-osx.a
-  APPLDFLAGS := /usr/local/lib/libSDL-1.2.0.dylib /usr/local/lib/libSDLmain.a
   ifneq ($(strip $(macosx_arch)),)
          CFLAGS += -arch $(macosx_arch)
          LDFLAGS += -arch $(macosx_arch)
@@ -308,9 +318,6 @@ $(BINDIR)/%.o : %.c
 
 $(EXE) : $(OBJS) $(APPOBJS)
        @mkdir -p $(dir $@)
-#ifeq ($(strip $(macosx)),true)
-#      ranlib ./libSDLmain-osx.a libSDLmain-osx-ranlib
-#endif
        $(LD) -o $@ $(APPLDFLAGS) $(LDFLAGS) $(OBJS) $(APPOBJS) $(POSTLDFLAGS)
 
 clean:

diff --git a/makemac.sh b/makemac.sh
new file mode 100755 (executable)
index 0000000..d7f8d11
--- /dev/null
+++ b/makemac.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+set -x
+
+NCPU=`sysctl -n hw.ncpu`
+
+for arch in ppc i386 x86_64 ; do
+    make macosx=true macosx_arch=$arch clean
+    make macosx=true macosx_arch=$arch -j$NCPU
+    BINS="$BINS run/lugaru-$arch"
+done
+
+rm -f run/lugaru-bin
+lipo -create -o run/lugaru-bin $BINS
+