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

Allow to use a different pkg-config when cross compiling

Browse Source 
Debian bug #918725
This commit is contained in:
Helmut Grohne 2019-01-08 21:12:09 +01:00 committed by Adrien Destugues
parent 21da97be6a
commit 56794c8589
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/Makefile
View File

@ -90,6 +90,7 @@ TARTRANSFORM = --strip=1 --transform 's,^,grafx2/,g'
ifeq (default,$(origin CC)) ifeq (default,$(origin CC))
CC = gcc CC = gcc
endif endif
PKG_CONFIG ?= pkg-config
# There is no uname under windows, but we can guess we are there with the COMSPEC env.var # There is no uname under windows, but we can guess we are there with the COMSPEC env.var
# Windows specific # Windows specific
@ -191,14 +192,14 @@ ifneq ($(SDLCONFIG), )
SDLCOPT = $(shell sdl-config --cflags) SDLCOPT = $(shell sdl-config --cflags)
ifeq ($(OSX_STATIC), 1) ifeq ($(OSX_STATIC), 1)
SDLLOPT = $(shell sdl-config --static-libs | sed 's/-lSDL //' | sed 's/-lX[^ ]*//g' | sed 's/-L[^ ]*//g') SDLLOPT = $(shell sdl-config --static-libs | sed 's/-lSDL //' | sed 's/-lX[^ ]*//g' | sed 's/-L[^ ]*//g')
SDLLIBDIR = $(shell pkg-config --variable=libdir SDL_image) SDLLIBDIR = $(shell $(PKG_CONFIG) --variable=libdir SDL_image)
#SDLLOPT += $(SDLLIBDIR)/libSDL.a #SDLLOPT += $(SDLLIBDIR)/libSDL.a
SDLLOPT += $(addsuffix .a, $(shell ../tools/osx_find_dependencies.sh $(SDLLIBDIR)/libSDL_image.dylib $(SDLLIBDIR)/libSDL_ttf.dylib | grep -v SDL | cut -d'.' -f 1)) SDLLOPT += $(addsuffix .a, $(shell ../tools/osx_find_dependencies.sh $(SDLLIBDIR)/libSDL_image.dylib $(SDLLIBDIR)/libSDL_ttf.dylib | grep -v SDL | cut -d'.' -f 1))
SDLLOPT += $(SDLLIBDIR)/libSDL_image.a SDLLOPT += $(SDLLIBDIR)/libSDL_image.a
TTFLOPT = TTFLOPT =
SDLLOPT += $(shell pkg-config --variable=libdir SDL_ttf)/libSDL_ttf.a SDLLOPT += $(shell $(PKG_CONFIG) --variable=libdir SDL_ttf)/libSDL_ttf.a
else else
SDLLOPT = $(shell sdl-config --libs) $(shell pkg-config --libs SDL_image) SDLLOPT = $(shell sdl-config --libs) $(shell $(PKG_CONFIG) --libs SDL_image)
endif endif
else else
# these are for use with Mac OS X native frameworks # these are for use with Mac OS X native frameworks
@ -209,32 +210,32 @@ endif
endif endif
ifeq ($(API),sdl2) ifeq ($(API),sdl2)
SDLCOPT = $(shell sdl2-config --cflags) SDLCOPT = $(shell sdl2-config --cflags)
#TTFCOPT = $(shell pkg-config --cflags SDL2_ttf) #TTFCOPT = $(shell $(PKG_CONFIG) --cflags SDL2_ttf)
ifeq ($(OSX_STATIC), 1) ifeq ($(OSX_STATIC), 1)
SDLLOPT = $(shell sdl2-config --static-libs | sed 's/-lSDL2//' | sed 's/-L[^ ]*//') SDLLOPT = $(shell sdl2-config --static-libs | sed 's/-lSDL2//' | sed 's/-L[^ ]*//')
SDLLIBDIR = $(shell pkg-config --variable=libdir SDL2_image) SDLLIBDIR = $(shell $(PKG_CONFIG) --variable=libdir SDL2_image)
SDLLOPT += $(SDLLIBDIR)/libSDL2.a SDLLOPT += $(SDLLIBDIR)/libSDL2.a
# trick to get all dependencies # trick to get all dependencies
SDLLOPT += $(addsuffix .a, $(shell ../tools/osx_find_dependencies.sh $(SDLLIBDIR)/libSDL2_image.dylib $(SDLLIBDIR)/libSDL2_ttf.dylib | grep -v SDL2 | cut -d'.' -f 1)) SDLLOPT += $(addsuffix .a, $(shell ../tools/osx_find_dependencies.sh $(SDLLIBDIR)/libSDL2_image.dylib $(SDLLIBDIR)/libSDL2_ttf.dylib | grep -v SDL2 | cut -d'.' -f 1))
SDLLOPT += $(SDLLIBDIR)/libSDL2_image.a SDLLOPT += $(SDLLIBDIR)/libSDL2_image.a
TTFLOPT = TTFLOPT =
SDLLOPT += $(shell pkg-config --variable=libdir SDL2_ttf)/libSDL2_ttf.a SDLLOPT += $(shell $(PKG_CONFIG) --variable=libdir SDL2_ttf)/libSDL2_ttf.a
else else
SDLLOPT = $(shell sdl2-config --libs) $(shell pkg-config --libs SDL2_image) SDLLOPT = $(shell sdl2-config --libs) $(shell $(PKG_CONFIG) --libs SDL2_image)
SDLLOPT += -Wl,-framework,Cocoa SDLLOPT += -Wl,-framework,Cocoa
TTFLOPT = $(shell pkg-config --libs SDL2_ttf) TTFLOPT = $(shell $(PKG_CONFIG) --libs SDL2_ttf)
endif endif
endif endif
# these are for use with macports # these are for use with macports
LUAPKG := $(shell for p in lua lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 ; do pkg-config --exists $$p && echo $$p && break ; done) LUAPKG := $(shell for p in lua lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 ; do $(PKG_CONFIG) --exists $$p && echo $$p && break ; done)
ifneq ($(LUAPKG), ) ifneq ($(LUAPKG), )
ifeq ($(OSX_STATIC),1) ifeq ($(OSX_STATIC),1)
LUACOPT = $(shell pkg-config $(LUAPKG) --cflags | sed 's/-I/-idirafter/') LUACOPT = $(shell $(PKG_CONFIG) $(LUAPKG) --cflags | sed 's/-I/-idirafter/')
LUALOPT = $(shell pkg-config $(LUAPKG) --variable=libdir)/liblua.a LUALOPT = $(shell $(PKG_CONFIG) $(LUAPKG) --variable=libdir)/liblua.a
else else
LUACOPT = $(shell pkg-config $(LUAPKG) --cflags) LUACOPT = $(shell $(PKG_CONFIG) $(LUAPKG) --cflags)
LUALOPT = $(shell pkg-config $(LUAPKG) --libs) LUALOPT = $(shell $(PKG_CONFIG) $(LUAPKG) --libs)
endif endif
else else
# these are for use with Mac OS X native frameworks # these are for use with Mac OS X native frameworks
@ -343,8 +344,8 @@ endif
LUALOPT = LUALOPT =
else else
LUAPKG=lua LUAPKG=lua
LUACOPT = -D__ENABLE_LUA__ $(shell pkg-config $(LUAPKG) --cflags) LUACOPT = -D__ENABLE_LUA__ $(shell $(PKG_CONFIG) $(LUAPKG) --cflags)
LUALOPT = $(shell pkg-config $(LUAPKG) --libs) LUALOPT = $(shell $(PKG_CONFIG) $(LUAPKG) --libs)
endif endif
COPT = -W -Wall -g $(shell sdl-config --cflags) $(TTFCOPT) -I/boot/common/include $(LUACOPT) COPT = -W -Wall -g $(shell sdl-config --cflags) $(TTFCOPT) -I/boot/common/include $(LUACOPT)
COPT += -DENABLE_FILENAMES_ICONV COPT += -DENABLE_FILENAMES_ICONV
@ -437,9 +438,9 @@ endif
ifdef WIN32CROSS ifdef WIN32CROSS
LUACOPT = -I../3rdparty/usr/include LUACOPT = -I../3rdparty/usr/include
else else
LUAPKG := $(shell for p in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua ; do pkg-config --exists $$p && echo $$p && break ; done) LUAPKG := $(shell for p in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua ; do $(PKG_CONFIG) --exists $$p && echo $$p && break ; done)
LUACOPT = $(shell pkg-config $(LUAPKG) --cflags) LUACOPT = $(shell $(PKG_CONFIG) $(LUAPKG) --cflags)
LUALOPT = $(shell pkg-config $(LUAPKG) --libs) LUALOPT = $(shell $(PKG_CONFIG) $(LUAPKG) --libs)
endif endif
endif endif
endif endif
@ -448,7 +449,7 @@ endif
ifdef WIN32CROSS ifdef WIN32CROSS
#cross compile a Win32 executable #cross compile a Win32 executable
CROSS_CC ?= $(shell which i686-w64-mingw32-gcc || which mingw32-gcc) CROSS_CC ?= $(shell which i686-w64-mingw32-gcc || which mingw32-gcc)
CROSS_PKGCONFIG ?= $(shell which i686-w64-mingw32-pkg-config || which mingw32-pkg-config || which pkg-config) CROSS_PKGCONFIG ?= $(shell which i686-w64-mingw32-pkg-config || which mingw32-pkg-config || which $(PKG_CONFIG))
CROSS_SDLCONFIG ?= $(shell which ../3rdparty/usr/bin/sdl-config || which /usr/local/cross-tools/i386-mingw32/bin/sdl-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 "$${PWD}/../3rdparty/usr/lib/pkgconfig" ; fi ) CROSS_PKG_CONFIG_PATH ?= $(shell if [ -d ../3rdparty/usr ] ; then echo "$${PWD}/../3rdparty/usr/lib/pkgconfig" ; fi )
CC = $(CROSS_CC) CC = $(CROSS_CC)
@ -548,7 +549,7 @@ endif
COPT += $(shell sdl2-config --cflags) COPT += $(shell sdl2-config --cflags)
endif endif
COPT += $(TTFCOPT) $(LUACOPT) $(JOYCOPT) -O$(OPTIM) COPT += $(TTFCOPT) $(LUACOPT) $(JOYCOPT) -O$(OPTIM)
COPT += $(shell pkg-config --cflags libpng) COPT += $(shell $(PKG_CONFIG) --cflags libpng)
ifneq ($(PLATFORM), FreeBSD) ifneq ($(PLATFORM), FreeBSD)
COPT += -D_XOPEN_SOURCE=700 COPT += -D_XOPEN_SOURCE=700
@ -562,22 +563,22 @@ endif
ifeq ($(API),sdl) ifeq ($(API),sdl)
LOPT += $(shell sdl-config --libs) -lSDL_image LOPT += $(shell sdl-config --libs) -lSDL_image
ifneq ($(NO_X11),1) ifneq ($(NO_X11),1)
LOPT += $(shell pkg-config --libs x11) LOPT += $(shell $(PKG_CONFIG) --libs x11)
COPT += $(shell pkg-config --cflags x11) COPT += $(shell $(PKG_CONFIG) --cflags x11)
endif endif
endif endif
ifeq ($(API),sdl2) ifeq ($(API),sdl2)
LOPT += $(shell sdl2-config --libs) -lSDL2_image LOPT += $(shell sdl2-config --libs) -lSDL2_image
ifneq ($(NO_X11),1) ifneq ($(NO_X11),1)
LOPT += $(shell pkg-config --libs x11) LOPT += $(shell $(PKG_CONFIG) --libs x11)
COPT += $(shell pkg-config --cflags x11) COPT += $(shell $(PKG_CONFIG) --cflags x11)
endif endif
endif endif
ifeq ($(NO_X11),1) ifeq ($(NO_X11),1)
COPT += -DNO_X11 COPT += -DNO_X11
endif endif
LOPT += $(TTFLOPT) LOPT += $(TTFLOPT)
LOPT += $(shell pkg-config --libs libpng libtiff-4) LOPT += $(shell $(PKG_CONFIG) --libs libpng libtiff-4)
LOPT += $(LUALOPT) LOPT += $(LUALOPT)
OBJDIR = ../obj/unix OBJDIR = ../obj/unix
FCLOPT = -lfontconfig FCLOPT = -lfontconfig