[quake3-commits] r2142 - in trunk: . code/libs/macosx

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-08-10 17:14:17 -0400 (Wed, 10 Aug 2011)
New Revision: 2142

Modified:
   trunk/Makefile
   trunk/code/libs/macosx/libSDL-1.2.0.dylib
   trunk/code/libs/macosx/libSDLmain.a
Log:
- More MacOSX changes to Makefile
- Ship libSDL-1.2.0.dylib with x86_64 platform support


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-08-10 20:48:53 UTC (rev 2141)
+++ trunk/Makefile	2011-08-10 21:14:17 UTC (rev 2142)
@@ -369,6 +369,7 @@
   HAVE_VM_COMPILED=true
   LIBS = -framework Cocoa
   CLIENT_LIBS=
+  RENDERER_LIBS=
   OPTIMIZEVM=
   
   BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
@@ -384,7 +385,7 @@
     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 @@
   #  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

Modified: trunk/code/libs/macosx/libSDL-1.2.0.dylib
===================================================================
(Binary files differ)

Modified: trunk/code/libs/macosx/libSDLmain.a
===================================================================
(Binary files differ)