Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 18:08:04 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Sync with MESS (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2012-04-11 14:48:01 +00:00
parent 8382d75558
commit 986f1ef77d
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,7 +365,7 @@ LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread
DEFS += -DMACOSX_USE_LIBSDL DEFS += -DMACOSX_USE_LIBSDL
endif # MACOSX_USE_LIBSDL endif # MACOSX_USE_LIBSDL
endif # Mac OS X else # ifeq ($(TARGETOS),macosx)
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
@ -374,6 +374,28 @@ ifeq ($(NO_X11),1)
NO_DEBUGGER = 1 NO_DEBUGGER = 1
endif endif
INCPATH += `$(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-D[^ ]*\)::g'`
CCOMFLAGS += `$(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-I[^ ]*\)::g'`
LIBS += -lm `$(SDL_CONFIG) --libs`
ifeq ($(SDL_LIBVER),sdl2)
ifdef SDL_INSTALL_ROOT
# FIXME: remove the directfb ref. later. This is just there for now to work around an issue with SDL1.3 and SDL2.0
INCPATH += -I$(SDL_INSTALL_ROOT)/include/directfb
endif
endif
INCPATH += `pkg-config --cflags fontconfig`
LIBS += `pkg-config --libs fontconfig`
ifeq ($(SDL_LIBVER),sdl2)
LIBS += -lSDL2_ttf -lutil
else
LIBS += -lSDL_ttf -lutil
endif
endif # not Mac OS X
ifneq (,$(findstring ppc,$(UNAME))) ifneq (,$(findstring ppc,$(UNAME)))
# override for preprocessor weirdness on PPC Linux # override for preprocessor weirdness on PPC Linux
CFLAGS += -Upowerpc CFLAGS += -Upowerpc
@ -400,28 +422,6 @@ LDFLAGS += -m32
endif endif
endif endif
INCPATH += `$(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-D[^ ]*\)::g'`
CCOMFLAGS += `$(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-I[^ ]*\)::g'`
LIBS += -lm `$(SDL_CONFIG) --libs`
ifeq ($(SDL_LIBVER),sdl2)
ifdef SDL_INSTALL_ROOT
# FIXME: remove the directfb ref. later. This is just there for now to work around an issue with SDL1.3 and SDL2.0
INCPATH += -I$(SDL_INSTALL_ROOT)/include/directfb
endif
endif
INCPATH += `pkg-config --cflags fontconfig`
LIBS += `pkg-config --libs fontconfig`
ifeq ($(SDL_LIBVER),sdl2)
LIBS += -lSDL2_ttf -lutil
else
LIBS += -lSDL_ttf -lutil
endif
endif # Unix endif # Unix
#------------------------------------------------- #-------------------------------------------------