diff --git a/Makefile b/Makefile index e1a7327f..1544f36d 100644 --- a/Makefile +++ b/Makefile @@ -369,6 +369,7 @@ ifeq ($(PLATFORM),darwin) HAVE_VM_COMPILED=true LIBS = -framework Cocoa CLIENT_LIBS= + RENDERER_LIBS= OPTIMIZEVM= BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes @@ -384,7 +385,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 @@ -418,8 +419,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/code/libs/macosx/libSDL-1.2.0.dylib b/code/libs/macosx/libSDL-1.2.0.dylib index 701e596f..93250be1 100755 Binary files a/code/libs/macosx/libSDL-1.2.0.dylib and b/code/libs/macosx/libSDL-1.2.0.dylib differ diff --git a/code/libs/macosx/libSDLmain.a b/code/libs/macosx/libSDLmain.a index 873e1b22..8e8c01ca 100644 Binary files a/code/libs/macosx/libSDLmain.a and b/code/libs/macosx/libSDLmain.a differ