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

3rdparty/Makefile: PKG_CONFIG_PATH => PKG_CONFIG_LIBDIR

Browse Source 
PKG_CONFIG_PATH add path to the default,
PKG_CONFIG_LIBDIR replace the default paths
This commit is contained in:
Thomas Bernard 2019-03-19 15:25:03 +01:00
parent 4dedc8c8a3
commit 9b2f256b63
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/Makefile vendored
View File

@ -301,7 +301,7 @@ $(PREFIX)/lib/libSDL2_image.a: $(PREFIX)/lib/libpng.a
$(PREFIX)/lib/libSDL2_image.a: $(PREFIX)/lib/libSDL2main.a $(PREFIX)/lib/libSDL2_image.a: $(PREFIX)/lib/libSDL2main.a
$(PREFIX)/lib/libSDL2_image.a: $(SDL2IMAGE)/.ok $(PREFIX)/lib/libSDL2_image.a: $(SDL2IMAGE)/.ok
cd $(SDL2IMAGE) && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \ cd $(SDL2IMAGE) && PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \
CC="$(CC) $(LDFLAGS)" CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib" \ CC="$(CC) $(LDFLAGS)" CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib" \
./configure --prefix=$(PREFIX) --host=$(HOST) --disable-sdltest \ ./configure --prefix=$(PREFIX) --host=$(HOST) --disable-sdltest \
--disable-webp --disable-imageio \ --disable-webp --disable-imageio \
@ -324,7 +324,7 @@ $(PREFIX)/lib/libSDL2_ttf.a: $(PREFIX)/lib/libfreetype.a
$(PREFIX)/lib/libSDL2_ttf.a: $(PREFIX)/lib/libSDL2main.a $(PREFIX)/lib/libSDL2_ttf.a: $(PREFIX)/lib/libSDL2main.a
$(PREFIX)/lib/libSDL2_ttf.a: $(SDL2TTF)/.ok $(PREFIX)/lib/libSDL2_ttf.a: $(SDL2TTF)/.ok
cd $(SDL2TTF) && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \ cd $(SDL2TTF) && PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \
CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib $(LDFLAGS)" \ CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib $(LDFLAGS)" \
./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) \ ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) \
--with-freetype-prefix=$(PREFIX) --host=$(HOST) --with-freetype-prefix=$(PREFIX) --host=$(HOST)
@ -435,7 +435,7 @@ $(PREFIX)/lib/libSDL_ttf.a: $(SDLTTF)/.ok
ifdef WIN32 ifdef WIN32
$(CP) $(PREFIX)/bin/SDL.dll $(SDLTTF) $(CP) $(PREFIX)/bin/SDL.dll $(SDLTTF)
endif endif
cd $(SDLTTF) && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \ cd $(SDLTTF) && PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \
CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib $(LDFLAGS) $(ADDLDFLAGS)" \ CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib $(LDFLAGS) $(ADDLDFLAGS)" \
./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) --with-freetype-prefix=$(PREFIX) \ ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) --with-freetype-prefix=$(PREFIX) \
--host=$(HOST) --host=$(HOST)