Make Apple-Q work like the Carbonized version.

[lugaru.git] / makefile

diff --git a/makefile b/makefile
index 2719849431c66d7203f874efed313a544ac6f517..54b17068223753cde0f8a529d93f6e62eba12472 100644 (file)
--- a/makefile
+++ b/makefile
@@ -15,27 +15,35 @@ GLUDIR := GLU
 LIBOGGDIR := libogg-1.0
 LIBVORBISDIR := libvorbis-1.0.1
 
-EXE := $(RUNDIR)/lugaru-bin
 
-CXX := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
-CC := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/gcc
-#CXX := g++
-#CC := gcc
-LD := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
+ifeq ($(strip $(macosx_arch)),)
+  macosx_arch := i386
+endif
 
-#OPT := -O0
-OPT := -O3 -fno-strict-aliasing -falign-loops=16 -fno-math-errno
-#OPT := -Os -fno-strict-aliasing
+ifeq ($(strip $(macosx)),true)
+   EXEEXT := $(macosx_arch)
+else
+   EXEEXT := bin
+endif
+
+EXE := $(RUNDIR)/lugaru-$(EXEEXT)
 
-# always use this on the Mac, even in debug builds, since we aren't building
-#  a dylib at this point.
 ifeq ($(strip $(macosx)),true)
-  OPT += -mdynamic-no-pic
+       CXX := g++-4.0
+       CC := gcc-4.0
+       LD := g++-4.0
+else
+       CXX := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
+       CC := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/gcc
+       LD := /opt/crosstool/gcc-4.1.2-glibc-2.3.6/i686-unknown-linux-gnu/i686-unknown-linux-gnu/bin/g++
 endif
 
+#OPT := -O0
+OPT := -O3 -fno-strict-aliasing -falign-loops=16 -fno-math-errno
+#OPT := -Os -fno-strict-aliasing
+
 DEFINES := \
        -DPLATFORM_UNIX=1 \
-       -DPLATFORM_LINUX=1 \
        -DUSE_SDL=1 \
        -DTRUE=1 \
        -DFALSE=0 \
@@ -66,10 +74,14 @@ CFLAGS := -g -c $(OPT) $(INCLUDES) $(DEFINES) -fsigned-char -pipe
 CFLAGS += -w
 
 ifeq ($(strip $(macosx)),true)
-  CFLAGS += -fpascal-strings -faltivec -fasm -force_cpusubtype_ALL -Wno-long-double -mdynamic-no-pic
-  CFLAGS += -DPLATFORM_BIGENDIAN=1 -DMACOSX=1 -DPLATFORM_MACOSX=1
-  LDFLAGS := -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework Carbon
-  APPLDFLAGS := $(SDLDIR)/lib/libSDL-1.2.0.dylib $(SDLDIR)/lib/libSDLmain-osx.a
+  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
+  ifneq ($(strip $(macosx_arch)),)
+         CFLAGS += -arch $(macosx_arch)
+         LDFLAGS += -arch $(macosx_arch)
+         APPLDFLAGS += -arch $(macosx_arch)
+  endif
 else
   CFLAGS += -DPLATFORM_LINUX=1
   LDFLAGS := ./libSDL-1.2.so.0 -Wl,-rpath,\$$ORIGIN
@@ -306,10 +318,6 @@ $(BINDIR)/%.o : %.c
 
 $(EXE) : $(OBJS) $(APPOBJS)
        @mkdir -p $(dir $@)
-ifeq ($(strip $(macosx)),true)
-       ranlib $(SDLDIR)/lib/libSDLmain-osx.a
-       ranlib $(FREETYPEDIR)/lib/libfreetype-osx.a
-endif
        $(LD) -o $@ $(APPLDFLAGS) $(LDFLAGS) $(OBJS) $(APPOBJS) $(POSTLDFLAGS)
 
 clean: