chdir to base of app bundle on the Mac.

[lugaru.git] / makefile

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: