diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-08-10 21:14:17 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 23:27:02 +0000 |
| commit | 8d8d5286c4f18d6c419d5392802b5f0ed1abae14 (patch) | |
| tree | f9088699ebc197e05c0190ee5e81d5b0abbec595 /Makefile | |
| parent | c2aad047be007651f396ea55752709c587bbf8f1 (diff) | |
- More MacOSX changes to Makefile - Ship libSDL-1.2.0.dylib with x86_64 platform support
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 |