Merge branch 'zlib_pkgconfig' into 'master'
Zlib pkgconfig Linux build to include libgme by default See merge request !116
This commit is contained in:
commit
d782638da8
2 files changed
+21
-3
No files matched your search
@@ -179,6 +179,9 @@ endif
|
||||
|
||||
ifdef LINUX
|
||||
UNIXCOMMON=1
|
||||
ifndef NOGME
|
||||
HAVE_LIBGME=1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef SOLARIS
|
||||
@@ -315,6 +318,13 @@ LIBS+=$(PNG_LDFLAGS)
|
||||
CFLAGS+=$(PNG_CFLAGS)
|
||||
endif
|
||||
|
||||
ZLIB_PKGCONFIG?=zlib
|
||||
ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
|
||||
ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
|
||||
|
||||
LIBS+=$(ZLIB_LDFLAGS)
|
||||
CFLAGS+=$(ZLIB_CFLAGS)
|
||||
|
||||
ifdef HAVE_LIBGME
|
||||
OPTS+=-DHAVE_LIBGME
|
||||
|
||||
|
||||
+11
-3
@@ -85,13 +85,21 @@ endif
|
||||
OBJS=$(OBJDIR)/dx_error.o $(OBJDIR)/fabdxlib.o $(OBJDIR)/win_vid.o $(OBJDIR)/win_dll.o
|
||||
endif
|
||||
|
||||
|
||||
ZLIB_CFLAGS?=-I../libs/zlib
|
||||
ifdef MINGW64
|
||||
ZLIB_LDFLAGS?=-L../libs/zlib/win32 -lz64
|
||||
else
|
||||
ZLIB_LDFLAGS?=-L../libs/zlib/win32 -lz32
|
||||
endif
|
||||
|
||||
ifndef NOPNG
|
||||
ifndef PNG_CONFIG
|
||||
PNG_CFLAGS?=-I../libs/libpng-src -I../libs/zlib
|
||||
PNG_CFLAGS?=-I../libs/libpng-src
|
||||
ifdef MINGW64
|
||||
PNG_LDFLAGS?=-L../libs/libpng-src/projects -lpng64 -L../libs/zlib/win32 -lz64
|
||||
PNG_LDFLAGS?=-L../libs/libpng-src/projects -lpng64
|
||||
else
|
||||
PNG_LDFLAGS?=-L../libs/libpng-src/projects -lpng32 -L../libs/zlib/win32 -lz32
|
||||
PNG_LDFLAGS?=-L../libs/libpng-src/projects -lpng32
|
||||
endif #MINGW64
|
||||
endif #PNG_CONFIG
|
||||
endif #NOPNG
|
||||
|
||||
Reference in new issue
Block a user