From 8d8d5286c4f18d6c419d5392802b5f0ed1abae14 Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Wed, 10 Aug 2011 21:14:17 +0000 Subject: - More MacOSX changes to Makefile - Ship libSDL-1.2.0.dylib with x86_64 platform support --- Makefile | 6 ++++-- src/libs/macosx/libSDL-1.2.0.dylib | Bin 4436304 -> 1857288 bytes src/libs/macosx/libSDLmain.a | Bin 97816 -> 129532 bytes 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 Binary files a/src/libs/macosx/libSDL-1.2.0.dylib and b/src/libs/macosx/libSDL-1.2.0.dylib differ diff --git a/src/libs/macosx/libSDLmain.a b/src/libs/macosx/libSDLmain.a index 873e1b22..8e8c01ca 100644 Binary files a/src/libs/macosx/libSDLmain.a and b/src/libs/macosx/libSDLmain.a differ -- cgit