From 47ec9072622b00a2b2b5a0e561547b0413966c7a Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Fri, 25 Jan 2019 22:13:31 +0100
Subject: [PATCH] tools/sdl_image_test: fix build with 3rdparty libs built

---
 tools/sdl_image_test/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/sdl_image_test/Makefile b/tools/sdl_image_test/Makefile
index 09636ee0..ba81d034 100644
--- a/tools/sdl_image_test/Makefile
+++ b/tools/sdl_image_test/Makefile
@@ -2,27 +2,28 @@ CFLAGS = -Wall -O -g
 
 ifeq ($(API),sdl2)
 # SDL 2.x
-SDLCONFIG = sdl2-config
+SDLCONFIGNAME = sdl2-config
 SDLIMAGE = SDL2_image
 BIN = showimage-sdl2
 CFLAGS += -DUSE_SDL2
 else
 # SDL 1.2.x
-SDLCONFIG = sdl-config
+SDLCONFIGNAME = sdl-config
 SDLIMAGE = SDL_image
 BIN = showimage
 CFLAGS += -DUSE_SDL
 endif
 
+PKGCONFIG_PATH = $(shell if [ -d ../../3rdparty/usr ] ; then echo "PKG_CONFIG_LIBDIR=$${PWD}/../../3rdparty/usr/lib/pkgconfig" ; fi )
+
 ifdef WIN32CROSS
 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)
-SDLCONFIGNAME := $(SDLCONFIG)
 SDLCONFIG = $(shell which ../../3rdparty/usr/bin/$(SDLCONFIGNAME) || which /usr/local/cross-tools/i386-mingw32/bin/$(SDLCONFIGNAME))
 BIN := $(BIN).exe
 else
-PKGCONFIG = pkg-config
+PKGCONFIG = $(PKGCONFIG_PATH) pkg-config
+SDLCONFIG = $(shell which ../../3rdparty/usr/bin/$(SDLCONFIGNAME) || which $(SDLCONFIGNAME))
 endif
 
 CFLAGS += $(shell $(SDLCONFIG) --cflags)