From 2c5a7f1f2929605204277bf249569c5202244a30 Mon Sep 17 00:00:00 2001 From: ashmew2 Date: Sun, 17 Sep 2017 08:39:54 +0000 Subject: [PATCH] Patch libjpeg and libpng makefiles for netsurf git-svn-id: svn://kolibrios.org@6981 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/sdk/sources/libjpeg/Makefile | 5 +++-- contrib/sdk/sources/libpng/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/sdk/sources/libjpeg/Makefile b/contrib/sdk/sources/libjpeg/Makefile index 9ade9ec9f4..c2106121da 100644 --- a/contrib/sdk/sources/libjpeg/Makefile +++ b/contrib/sdk/sources/libjpeg/Makefile @@ -9,11 +9,12 @@ AR = kos32-ar LD = kos32-ld STRIP = kos32-strip -INSTALLDIR:= /home/autobuild/tools/win32/lib +INSTALLDIR ?= /home/autobuild/tools/win32/lib CFLAGS = -UWIN32 -UWindows -U_WINDOWS -U_WIN32 -U__WIN32__ -c -O2 -fno-ident -fomit-frame-pointer -LDFLAGS= -shared -s -T dll.lds --entry _DllStartup --image-base=0 +LDFLAGS = $(LDFLAGS_CMD) +LDFLAGS+= -shared -s -T dll.lds --entry _DllStartup --image-base=0a LDFLAGS+= --out-implib $(LIBRARY).dll.a ARFLAGS:= crs diff --git a/contrib/sdk/sources/libpng/Makefile b/contrib/sdk/sources/libpng/Makefile index 4783125911..ba722c1b41 100644 --- a/contrib/sdk/sources/libpng/Makefile +++ b/contrib/sdk/sources/libpng/Makefile @@ -5,11 +5,12 @@ AR = kos32-ar LD = kos32-ld STRIP = kos32-strip -INSTALLDIR:= /home/autobuild/tools/win32/lib +INSTALLDIR ?= /home/autobuild/tools/win32/lib CFLAGS = -UWIN32 -UWindows -U_WINDOWS -U_WIN32 -U__WIN32__ -c -O2 -fno-ident -fomit-frame-pointer -LDFLAGS= -shared -s -T dll.lds --entry _DllStartup --image-base=0 +LDFLAGS=$(LDFLAGS_CMD) +LDFLAGS+= -shared -s -T dll.lds --entry _DllStartup --image-base=0 LDFLAGS+= --out-implib $(LIBRARY).dll.a ARFLAGS:= crs