m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/sdl_image_test: fix build with 3rdparty libs built

Browse Source
This commit is contained in:
Thomas Bernard 2019-01-25 22:13:31 +01:00
parent f6d11077f2
commit 47ec907262
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/sdl_image_test/Makefile
View File

@ -2,27 +2,28 @@ CFLAGS = -Wall -O -g
ifeq ($(API),sdl2) ifeq ($(API),sdl2)
# SDL 2.x # SDL 2.x
SDLCONFIG = sdl2-config SDLCONFIGNAME = sdl2-config
SDLIMAGE = SDL2_image SDLIMAGE = SDL2_image
BIN = showimage-sdl2 BIN = showimage-sdl2
CFLAGS += -DUSE_SDL2 CFLAGS += -DUSE_SDL2
else else
# SDL 1.2.x # SDL 1.2.x
SDLCONFIG = sdl-config SDLCONFIGNAME = sdl-config
SDLIMAGE = SDL_image SDLIMAGE = SDL_image
BIN = showimage BIN = showimage
CFLAGS += -DUSE_SDL CFLAGS += -DUSE_SDL
endif endif
PKGCONFIG_PATH = $(shell if [ -d ../../3rdparty/usr ] ; then echo "PKG_CONFIG_LIBDIR=$${PWD}/../../3rdparty/usr/lib/pkgconfig" ; fi )
ifdef WIN32CROSS ifdef WIN32CROSS
CC = $(shell which i686-w64-mingw32-gcc || which mingw32-gcc) CC = $(shell which i686-w64-mingw32-gcc || which mingw32-gcc)
PKGCONFIG_PATH = $(shell if [ -d ../../3rdparty/usr ] ; then echo "PKG_CONFIG_LIBDIR=$${PWD}/../../3rdparty/usr/lib/pkgconfig" ; fi )
PKGCONFIG = $(PKGCONFIG_PATH) $(shell which i686-w64-mingw32-pkg-config || which mingw32-pkg-config || which pkg-config) PKGCONFIG = $(PKGCONFIG_PATH) $(shell which i686-w64-mingw32-pkg-config || which mingw32-pkg-config || which pkg-config)
SDLCONFIGNAME := $(SDLCONFIG)
SDLCONFIG = $(shell which ../../3rdparty/usr/bin/$(SDLCONFIGNAME) || which /usr/local/cross-tools/i386-mingw32/bin/$(SDLCONFIGNAME)) SDLCONFIG = $(shell which ../../3rdparty/usr/bin/$(SDLCONFIGNAME) || which /usr/local/cross-tools/i386-mingw32/bin/$(SDLCONFIGNAME))
BIN := $(BIN).exe BIN := $(BIN).exe
else else
PKGCONFIG = pkg-config PKGCONFIG = $(PKGCONFIG_PATH) pkg-config
SDLCONFIG = $(shell which ../../3rdparty/usr/bin/$(SDLCONFIGNAME) || which $(SDLCONFIGNAME))
endif endif
CFLAGS += $(shell $(SDLCONFIG) --cflags) CFLAGS += $(shell $(SDLCONFIG) --cflags)