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

Cross build: Include the right libpng*.dll within the ziprelease

Browse Source
This commit is contained in:
Thomas Bernard 2018-02-19 22:32:00 +01:00
parent a771b23982
commit 8f6e955307
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/Makefile vendored
View File

@ -28,6 +28,7 @@ FREETYPEURL=https://download.savannah.gnu.org/releases/freetype/$(FREETYPEARCH)
PREFIX = $(PWD)/usr
MKDIR = mkdir -p
CP = cp -v
TAR = $(shell which tar)
GETURL = $(shell which wget || echo "curl -O -L")
@ -138,6 +139,7 @@ $(PREFIX)/lib/libpng.a: $(LIBPNG)/.ok
cd $(LIBPNG) && CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS=-L$(PREFIX)/lib ./configure --prefix=$(PREFIX) --host=$(HOST)
cd $(LIBPNG) && $(MAKE)
cd $(LIBPNG) && $(MAKE) install
$(CP) $(PREFIX)/bin/libpng*.dll ../bin
$(LIBPNG)/.ok: archives/$(LIBPNGARCH)
$(TAR) xzf $<

4
src/Makefile
View File

@ -75,7 +75,7 @@ ifdef COMSPEC
PLATFORMOBJ = winres.o
PLATFORM = win32
#some misc files we have to add to the release archive under windows.
PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll bin/libpng14-14.dll bin/zlib1.dll $(TTFLIBS)
PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll $(wildcard ../bin/libpng*.dll) bin/zlib1.dll $(TTFLIBS)
ZIP = zip
else
@ -378,7 +378,7 @@ endif
endif
OBJDIR = ../obj/win32
PLATFORM = win32
PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll bin/libpng14-14.dll bin/zlib1.dll $(TTFLIBS)
PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll $(wildcard ../bin/libpng*.dll) bin/zlib1.dll $(TTFLIBS)
else
ifdef GP2XCROSS
#cross compile an exec for the gp2x