Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 16:19:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only evaluate sdl- and pkg-config commands once

Browse Source
This commit is contained in:
Ramiro Polla 2015-02-02 22:49:24 +01:00
parent 1db4dcd963
commit 2d1e9b160b
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,8 +215,11 @@ SYNC_IMPLEMENTATION = tc
SDL_NETWORK = taptun SDL_NETWORK = taptun
ifndef NO_USE_MIDI ifndef NO_USE_MIDI
INCPATH += `pkg-config --cflags alsa` ALSACFLAGS := $(shell pkg-config --cflags alsa)
LIBS += `pkg-config --libs alsa` ALSALIBS := $(shell pkg-config --libs alsa)
INCPATH += $(ALSACFLAGS)
LIBS += $(ALSALIBS)
endif endif
endif endif
@ -537,10 +540,13 @@ else
# files (header files are #include "SDL/something.h", so the extra "/SDL" # files (header files are #include "SDL/something.h", so the extra "/SDL"
# causes a significant problem) # causes a significant problem)
INCPATH += `$(SDL_CONFIG) --cflags | sed 's:/SDL::'` SDLCFLAGS := $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::')
CCOMFLAGS += -DNO_SDL_GLEXT
# Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m
LIBS += `$(SDL_CONFIG) --libs | sed 's/-lSDLmain//'` -lpthread -framework Cocoa -framework OpenGL SDLLIBS := $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//')
INCPATH += $(SDLCFLAGS)
CCOMFLAGS += -DNO_SDL_GLEXT
LIBS += $(SDLLIBS) -lpthread -framework Cocoa -framework OpenGL
DEFS += -DMACOSX_USE_LIBSDL DEFS += -DMACOSX_USE_LIBSDL
endif # MACOSX_USE_LIBSDL endif # MACOSX_USE_LIBSDL
@ -579,14 +585,18 @@ ifeq ($(NO_X11),1)
NO_DEBUGGER = 1 NO_DEBUGGER = 1
endif endif
SDLINCLUDES := $(shell $(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-D[^ ]*\)::g')
SDLDEFINES := $(shell $(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-I[^ ]*\)::g')
SDLLIBS := $(shell $(SDL_CONFIG) --libs)
# Don't pull in the system includes if we are compiling for Emscripten, which has its own headers # Don't pull in the system includes if we are compiling for Emscripten, which has its own headers
ifneq ($(TARGETOS),emscripten) ifneq ($(TARGETOS),emscripten)
INCPATH += `$(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-D[^ ]*\)::g'` INCPATH += $(SDLINCLUDES)
endif endif
CCOMFLAGS += `$(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-I[^ ]*\)::g'` CCOMFLAGS += $(SDLDEFINES)
BASELIBS += `$(SDL_CONFIG) --libs` BASELIBS += $(SDLLIBS)
LIBS += `$(SDL_CONFIG) --libs` LIBS += $(SDLLIBS)
ifeq ($(SDL_LIBVER),sdl2) ifeq ($(SDL_LIBVER),sdl2)
ifdef SDL_INSTALL_ROOT ifdef SDL_INSTALL_ROOT
@ -595,10 +605,13 @@ INCPATH += -I$(SDL_INSTALL_ROOT)/include/directfb
endif endif
endif endif
FONTCONFIGCFLAGS := $(shell pkg-config --cflags fontconfig)
FONTCONFIGLIBS := $(shell pkg-config --libs fontconfig)
ifneq ($(TARGETOS),emscripten) ifneq ($(TARGETOS),emscripten)
INCPATH += `pkg-config --cflags fontconfig` INCPATH += $(FONTCONFIGCFLAGS)
endif endif
LIBS += `pkg-config --libs fontconfig` LIBS += $(FONTCONFIGLIBS)
ifeq ($(SDL_LIBVER),sdl2) ifeq ($(SDL_LIBVER),sdl2)
LIBS += -lSDL2_ttf LIBS += -lSDL2_ttf
@ -702,8 +715,11 @@ endif # Win32
ifeq ($(BASE_TARGETOS),os2) ifeq ($(BASE_TARGETOS),os2)
INCPATH += `sdl-config --cflags` SDLCFLAGS := $(shell sdl-config --cflags)
LIBS += `sdl-config --libs` -lpthread SDLLIBS := $(shell sdl-config --libs)
INCPATH += $(SDLCFLAGS)
LIBS += $(SDLLIBS) -lpthread
endif # OS2 endif # OS2
@ -806,8 +822,11 @@ endif
# The newer debugger uses QT # The newer debugger uses QT
ifndef NO_USE_QTDEBUG ifndef NO_USE_QTDEBUG
INCPATH += `pkg-config QtGui --cflags` QTCFLAGS := $(shell pkg-config --cflags QtGui)
LIBS += `pkg-config QtGui --libs` QTLIBS := $(shell pkg-config --libs QtGui)
INCPATH += $(QTCFLAGS)
LIBS += $(QTLIBS)
endif endif
# some systems still put important things in a different prefix # some systems still put important things in a different prefix