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

tools/sdl_image_test: allow build with WIN32CROSS=1 API=sdl2

Browse Source
This commit is contained in:
Thomas Bernard 2019-01-22 14:18:42 +01:00
parent 7bf491c3a5
commit 16080ed4b4
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/sdl_image_test/Makefile
View File

@ -18,7 +18,8 @@ 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_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)
SDLCONFIG = $(shell which ../../3rdparty/usr/bin/sdl-config || which /usr/local/cross-tools/i386-mingw32/bin/sdl-config) SDLCONFIGNAME := $(SDLCONFIG)
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 = pkg-config
@ -29,7 +30,11 @@ CFLAGS += $(shell $(SDLCONFIG) --cflags)
LDLIBS = $(shell $(SDLCONFIG) --libs) LDLIBS = $(shell $(SDLCONFIG) --libs)
ifdef WIN32CROSS ifdef WIN32CROSS
ifeq ($(API),sdl2)
LDLIBS += -lSDL2_image
else
LDLIBS += -lSDL_image LDLIBS += -lSDL_image
endif
else else
LDLIBS += $(shell $(PKGCONFIG) $(SDLIMAGE) --libs-only-l) LDLIBS += $(shell $(PKGCONFIG) $(SDLIMAGE) --libs-only-l)