Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

sdl.mak updates

Browse Source 
- On targets supporting "-m64" and "-m32" use them.
- On unix ppc targets, add -Dpowerpc automatically
This commit is contained in:
Couriersud 2010-01-19 21:58:26 +00:00
parent d991c43b73
commit 98b6824982
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/osd/sdl/sdl.mak
View File

@ -169,12 +169,9 @@ SDLUTILMAIN = $(SDLOBJ)/SDLMain_tmpl.o
MAINLDFLAGS = -Xlinker -all_load MAINLDFLAGS = -Xlinker -all_load
NO_X11 = 1 NO_X11 = 1
ifdef BIGENDIAN ifdef BIGENDIAN
PPC=1
ifdef SYMBOLS ifdef SYMBOLS
CCOMFLAGS += -mlong-branch CCOMFLAGS += -mlong-branch
endif # SYMBOLS endif # SYMBOLS
endif
ifdef PPC
ifdef PTR64 ifdef PTR64
CCOMFLAGS += -arch ppc64 CCOMFLAGS += -arch ppc64
LDFLAGS += -arch ppc64 LDFLAGS += -arch ppc64
@ -182,7 +179,7 @@ else
CCOMFLAGS += -arch ppc CCOMFLAGS += -arch ppc
LDFLAGS += -arch ppc LDFLAGS += -arch ppc
endif endif
else else # BIGENDIAN
ifdef PTR64 ifdef PTR64
CCOMFLAGS += -arch x86_64 CCOMFLAGS += -arch x86_64
LDFLAGS += -arch x86_64 LDFLAGS += -arch x86_64
@ -190,7 +187,8 @@ else
CCOMFLAGS += -m32 -arch i386 CCOMFLAGS += -m32 -arch i386
LDFLAGS += -m32 -arch i386 LDFLAGS += -m32 -arch i386
endif endif
endif endif # BIGENDIAN
endif endif
ifeq ($(TARGETOS),win32) ifeq ($(TARGETOS),win32)
@ -199,6 +197,7 @@ SYNC_IMPLEMENTATION = win32
NO_X11 = 1 NO_X11 = 1
DEFS += -DSDLMAME_WIN32 -DX64_WINDOWS_ABI DEFS += -DSDLMAME_WIN32 -DX64_WINDOWS_ABI
LIBGL = -lopengl32 LIBGL = -lopengl32
SDLMAIN = $(SDLOBJ)/main.o
# needed for unidasm # needed for unidasm
LDFLAGS += -Wl,--allow-multiple-definition LDFLAGS += -Wl,--allow-multiple-definition
@ -217,12 +216,10 @@ CCOMFLAGS += -mms-bitfields \
LDFLAGS += -L$(GTK_INSTALL_ROOT)/lib LDFLAGS += -L$(GTK_INSTALL_ROOT)/lib
endif # GTK_INSTALL_ROOT endif # GTK_INSTALL_ROOT
SDLMAIN = $(SDLOBJ)/main.o # enable UNICODE
DEFS += -Dmain=utf8_main DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE
# enable UNICODE flags
DEFS += -DUNICODE -D_UNICODE
LDFLAGS += -municode LDFLAGS += -municode
endif endif
ifeq ($(TARGETOS),os2) ifeq ($(TARGETOS),os2)
@ -308,10 +305,32 @@ ifeq ($(BASE_TARGETOS),unix)
DEFS += -DSDLMAME_UNIX DEFS += -DSDLMAME_UNIX
DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
LIBGL = -lGL LIBGL = -lGL
ifeq ($(NO_X11),1)
NO_DEBUGGER = 1
endif
ifneq (,$(findstring ppc,$(UNAME)))
# override for preprocessor weirdness on PPC Linux # override for preprocessor weirdness on PPC Linux
ifdef powerpc
CFLAGS += -Upowerpc CFLAGS += -Upowerpc
SUPPORTSM32M64 = 1
endif
ifneq (,$(findstring x86_64,$(UNAME)))
SUPPORTSM32M64 = 1
endif
ifneq (,$(findstring i386,$(UNAME)))
SUPPORTSM32M64 = 1
endif
ifeq ($(SUPPORTSM32M64),1)
ifdef PTR64
CCOMFLAGS += -m64
LDFLAGS += -m64
else
CCOMFLAGS += -m32
LDFLAGS += -m32
endif
endif endif
ifndef SDL_INSTALL_ROOT ifndef SDL_INSTALL_ROOT
@ -322,10 +341,6 @@ CCOMFLAGS += -I$(SDL_INSTALL_ROOT)/include -D_GNU_SOURCE=1
LIBS += -lm -L$(SDL_INSTALL_ROOT)/lib -Wl,-rpath,$(SDL_INSTALL_ROOT)/lib -lSDL LIBS += -lm -L$(SDL_INSTALL_ROOT)/lib -Wl,-rpath,$(SDL_INSTALL_ROOT)/lib -lSDL
endif endif
ifeq ($(NO_X11),1)
NO_DEBUGGER = 1
endif
endif # Unix endif # Unix
#------------------------------------------------- #-------------------------------------------------