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

3rdparty: add libz as well, and make libpng use it

Browse Source
This commit is contained in:
Thomas Bernard 2018-02-19 01:53:42 +01:00
parent 156656c51a
commit 7ecef0d279
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -8,6 +8,7 @@ addons:
apt: apt:
packages: packages:
- gcc-mingw-w64-i686 - gcc-mingw-w64-i686
- mingw-w64-tools
- libsdl1.2-dev - libsdl1.2-dev
- libsdl-image1.2-dev - libsdl-image1.2-dev
- libsdl-ttf2.0-dev - libsdl-ttf2.0-dev

1
3rdparty/.gitignore vendored
View File

@ -5,3 +5,4 @@ SDL_image*/
jpeg-*/ jpeg-*/
libpng-*/ libpng-*/
tiff-*/ tiff-*/
zlib-*/

26
3rdparty/Makefile vendored
View File

@ -14,6 +14,9 @@ JPEGURL = http://www.ijg.org/files/$(JPEGARCH)
LIBTIFF = tiff-v3.4 LIBTIFF = tiff-v3.4
LIBTIFFARCH = $(LIBTIFF)-tar.gz LIBTIFFARCH = $(LIBTIFF)-tar.gz
LIBTIFFURL = ftp://ftp.sgi.com/graphics/tiff/$(LIBTIFFARCH) LIBTIFFURL = ftp://ftp.sgi.com/graphics/tiff/$(LIBTIFFARCH)
ZLIB=zlib-1.2.11
ZLIBARCH=$(ZLIB).tar.gz
ZLIBURL=https://www.zlib.net/$(ZLIBARCH)
# https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-0.6.1.tar.gz # https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-0.6.1.tar.gz
PREFIX = $(PWD)/usr PREFIX = $(PWD)/usr
@ -36,12 +39,12 @@ endif
HOST = $(shell $(CC) -dumpmachine) HOST = $(shell $(CC) -dumpmachine)
#HOST = i686-pc-mingw32 #HOST = i686-pc-mingw32
.PHONY: all clean libs libpng libsdl libsdl_image libjpeg libtiff .PHONY: all clean libs libpng libsdl libsdl_image libjpeg libtiff zlib
all: libs all: libs
clean: clean:
$(RM) -r archives $(LIBPNG) $(RM) -r archives $(LIBPNG) $(ZLIB) $(SDLIMAGE) $(JPEGDIR) $(LIBTIFF)
libs: libpng libsdl libsdl_image libs: libpng libsdl libsdl_image
libsdl: $(PREFIX)/lib/libSDLmain.a libsdl: $(PREFIX)/lib/libSDLmain.a
@ -49,6 +52,7 @@ libsdl_image: $(PREFIX)/lib/libSDL_image.a
libjpeg: $(PREFIX)/lib/libjpeg.a libjpeg: $(PREFIX)/lib/libjpeg.a
libpng: $(PREFIX)/lib/libpng.a libpng: $(PREFIX)/lib/libpng.a
libtiff: $(PREFIX)/lib/libtiff.a libtiff: $(PREFIX)/lib/libtiff.a
zlib: $(PREFIX)/lib/libz.a
$(PREFIX)/lib/libSDLmain.a: archives/$(SDLDEVEL) $(PREFIX)/lib/libSDLmain.a: archives/$(SDLDEVEL)
$(TAR) xzf $< $(TAR) xzf $<
@ -60,7 +64,7 @@ $(PREFIX)/lib/libSDL_image.a: $(PREFIX)/lib/libtiff.a
$(PREFIX)/lib/libSDL_image.a: $(PREFIX)/lib/libpng.a $(PREFIX)/lib/libSDL_image.a: $(PREFIX)/lib/libpng.a
$(PREFIX)/lib/libSDL_image.a: $(SDLIMAGE)/.ok $(PREFIX)/lib/libSDL_image.a: $(SDLIMAGE)/.ok
cd $(SDLIMAGE) && CC=$(CC) CFLAGS=-I$(PREFIX)/include LDFLAGS=-L$(PREFIX)/lib LIBPNG_CFLAGS= LIBPNG_LIBS=-lpng ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) --host=$(HOST) --disable-webp cd $(SDLIMAGE) && CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS=-L$(PREFIX)/lib LIBPNG_CFLAGS= LIBPNG_LIBS=-lpng ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) --host=$(HOST) --disable-webp
cd $(SDLIMAGE) && $(MAKE) cd $(SDLIMAGE) && $(MAKE)
cd $(SDLIMAGE) && $(MAKE) install cd $(SDLIMAGE) && $(MAKE) install
@ -93,8 +97,10 @@ $(LIBTIFF)/.ok: archives/$(LIBTIFFARCH)
$(TAR) xzf $< $(TAR) xzf $<
touch $@ touch $@
$(PREFIX)/lib/libpng.a: $(PREFIX)/lib/libz.a
$(PREFIX)/lib/libpng.a: $(LIBPNG)/.ok $(PREFIX)/lib/libpng.a: $(LIBPNG)/.ok
cd $(LIBPNG) && CC=$(CC) ./configure --prefix=$(PREFIX) --host=$(HOST) cd $(LIBPNG) && CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS=-L$(PREFIX)/lib ./configure --prefix=$(PREFIX) --host=$(HOST)
cd $(LIBPNG) && $(MAKE) cd $(LIBPNG) && $(MAKE)
cd $(LIBPNG) && $(MAKE) install cd $(LIBPNG) && $(MAKE) install
@ -102,6 +108,14 @@ $(LIBPNG)/.ok: archives/$(LIBPNGARCH)
$(TAR) xzf $< $(TAR) xzf $<
touch $@ touch $@
$(PREFIX)/lib/libz.a: $(ZLIB)/.ok
cd $(ZLIB) && $(MAKE) -fwin32/Makefile.gcc PREFIX=$(shell echo $(CC) | sed 's/^\(.*\)gcc/\1/')
cd $(ZLIB) && INCLUDE_PATH=$(PREFIX)/include LIBRARY_PATH=$(PREFIX)/lib BINARY_PATH=$(PREFIX)/bin $(MAKE) install -fwin32/Makefile.gcc SHARED_MODE=1
$(ZLIB)/.ok: archives/$(ZLIBARCH)
$(TAR) xzf $<
touch $@
archives/$(LIBPNGARCH): archives/$(LIBPNGARCH):
@$(MKDIR) $(@D) @$(MKDIR) $(@D)
cd $(@D) && $(GETURL) $(LIBPNGURL) cd $(@D) && $(GETURL) $(LIBPNGURL)
@ -121,3 +135,7 @@ archives/$(JPEGARCH):
archives/$(LIBTIFFARCH): archives/$(LIBTIFFARCH):
@$(MKDIR) $(@D) @$(MKDIR) $(@D)
cd $(@D) && $(GETURL) $(LIBTIFFURL) cd $(@D) && $(GETURL) $(LIBTIFFURL)
archives/$(ZLIBARCH):
@$(MKDIR) $(@D)
cd $(@D) && $(GETURL) $(ZLIBURL)