diff --git a/src/Makefile b/src/Makefile index 8a223975..15ea90e6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -363,8 +363,9 @@ endif ifdef WIN32CROSS #cross compile a Win32 executable CROSS_CC ?= $(shell which i686-w64-mingw32-gcc || which mingw32-gcc) - CROSS_PKGCONFIG ?= $(shell i686-w64-mingw32-pkg-config || mingw32-pkg-config) - CROSS_SDLCONFIG ?= /usr/local/cross-tools/i386-mingw32/bin/sdl-config + CROSS_PKGCONFIG ?= $(shell which i686-w64-mingw32-pkg-config || which mingw32-pkg-config) + CROSS_SDLCONFIG ?= $(shell which ../3rdparty/usr/bin/sdl-config || which /usr/local/cross-tools/i386-mingw32/bin/sdl-config) + CROSS_PKG_CONFIG_PATH ?= $(shell if [ -d ../3rdparty/usr ] ; then echo "../3rdparty/usr/lib/pkgconfig" ; fi ) CC = $(CROSS_CC) BIN = ../bin/grafx2.exe COPT = -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -g -ggdb -Dmain=SDL_main $(shell $(CROSS_SDLCONFIG) --cflags) $(TTFCOPT)