mirror of
https://github.com/UberGames/lilium-voyager.git
synced 2025-01-31 11:20:32 +00:00
- More MacOSX changes to Makefile
- Ship libSDL-1.2.0.dylib with x86_64 platform support
This commit is contained in:
parent
99e157e066
commit
08acc75a1a
3 changed files with 4 additions and 2 deletions
6
Makefile
6
Makefile
|
@ -369,6 +369,7 @@ ifeq ($(PLATFORM),darwin)
|
||||||
HAVE_VM_COMPILED=true
|
HAVE_VM_COMPILED=true
|
||||||
LIBS = -framework Cocoa
|
LIBS = -framework Cocoa
|
||||||
CLIENT_LIBS=
|
CLIENT_LIBS=
|
||||||
|
RENDERER_LIBS=
|
||||||
OPTIMIZEVM=
|
OPTIMIZEVM=
|
||||||
|
|
||||||
BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
|
BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
|
||||||
|
@ -384,7 +385,7 @@ ifeq ($(PLATFORM),darwin)
|
||||||
OPTIMIZEVM += -march=prescott -mfpmath=sse
|
OPTIMIZEVM += -march=prescott -mfpmath=sse
|
||||||
# x86 vm will crash without -mstackrealign since MMX instructions will be
|
# x86 vm will crash without -mstackrealign since MMX instructions will be
|
||||||
# used no matter what and they corrupt the frame pointer in VM calls
|
# used no matter what and they corrupt the frame pointer in VM calls
|
||||||
BASE_CFLAGS += -mstackrealign
|
BASE_CFLAGS += -m32 -mstackrealign
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),x86_64)
|
ifeq ($(ARCH),x86_64)
|
||||||
OPTIMIZEVM += -mfpmath=sse
|
OPTIMIZEVM += -mfpmath=sse
|
||||||
|
@ -418,8 +419,9 @@ ifeq ($(PLATFORM),darwin)
|
||||||
# the file has been modified by each build.
|
# the file has been modified by each build.
|
||||||
LIBSDLMAIN=$(B)/libSDLmain.a
|
LIBSDLMAIN=$(B)/libSDLmain.a
|
||||||
LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a
|
LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a
|
||||||
CLIENT_LIBS += -framework IOKit -framework OpenGL \
|
CLIENT_LIBS += -framework IOKit \
|
||||||
$(LIBSDIR)/macosx/libSDL-1.2.0.dylib
|
$(LIBSDIR)/macosx/libSDL-1.2.0.dylib
|
||||||
|
RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL-1.2.0.dylib
|
||||||
|
|
||||||
OPTIMIZEVM += -falign-loops=16
|
OPTIMIZEVM += -falign-loops=16
|
||||||
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue