summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRichard Allen <ra@ra.is>2012-12-31 01:32:15 +0000
committerTim Angus <tim@ngus.net>2013-01-12 21:32:37 +0000
commitdc4dfc501ca90ae777ec27ca1e3df7931fd4eeca (patch)
tree46504d7434d46e8f83dbd647c02d3b143b7bb823 /Makefile
parent76de8f54bd19b323229d02f27f38e49e92638c7e (diff)
More fixes to the macosx buildsystem. This removes the SDL Framework and makes use of a SDL library that is position independant. This also brings back PPC builds into the UB and also as a standa alone build choice.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3c4b814d..258446d3 100644
--- a/Makefile
+++ b/Makefile
@@ -389,7 +389,7 @@ else # ifeq Linux
ifeq ($(PLATFORM),darwin)
HAVE_VM_COMPILED=true
- LIBS = -framework Cocoa -framework SDL
+ LIBS = -framework Cocoa
CLIENT_LIBS=
RENDERER_LIBS=
OPTIMIZEVM=
@@ -446,8 +446,8 @@ ifeq ($(PLATFORM),darwin)
LIBSDLMAIN=$(B)/libSDLmain.a
LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a
CLIENT_LIBS += -framework IOKit \
- -framework SDL
- RENDERER_LIBS += -framework OpenGL -framework SDL
+ $(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