- More MacOSX changes to Makefile - Ship libSDL-1.2.0.dylib with x86_64 platform support

3 files changed, 4 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 97e3fff5..75ece978 100644
--- a/Makefile
+++ b/Makefile
@@ -361,6 +361,7 @@ ifeq ($(PLATFORM),darwin)
   HAVE_VM_COMPILED=true
   LIBS = -framework Cocoa
   CLIENT_LIBS=
+  RENDERER_LIBS=
   OPTIMIZEVM=
 
   BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
@@ -376,7 +377,7 @@ ifeq ($(PLATFORM),darwin)
     OPTIMIZEVM += -march=prescott -mfpmath=sse
     # x86 vm will crash without -mstackrealign since MMX instructions will be
     # used no matter what and they corrupt the frame pointer in VM calls
-    BASE_CFLAGS += -mstackrealign
+    BASE_CFLAGS += -m32 -mstackrealign
   endif
   ifeq ($(ARCH),x86_64)
     OPTIMIZEVM += -mfpmath=sse
@@ -410,8 +411,9 @@ ifeq ($(PLATFORM),darwin)
   #  the file has been modified by each build.
   LIBSDLMAIN=$(B)/libSDLmain.a
   LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a
-  CLIENT_LIBS += -framework IOKit -framework OpenGL \
+  CLIENT_LIBS += -framework IOKit \
     $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
+  RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
 
   OPTIMIZEVM += -falign-loops=16
   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
diff --git a/src/libs/macosx/libSDL-1.2.0.dylib b/src/libs/macosx/libSDL-1.2.0.dylib
index 701e596f..93250be1 100755
--- a/src/libs/macosx/libSDL-1.2.0.dylib
+++ b/src/libs/macosx/libSDL-1.2.0.dylib
diff --git a/src/libs/macosx/libSDLmain.a b/src/libs/macosx/libSDLmain.a
index 873e1b22..8e8c01ca 100644
--- a/src/libs/macosx/libSDLmain.a
+++ b/src/libs/macosx/libSDLmain.a