mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-27 21:01:04 +00:00
Makefile: move ZLIB flags outside of GME check
This commit is contained in:
parent
93c9841360
commit
b9b5d20300
1 changed files with 3 additions and 3 deletions
|
@ -318,9 +318,6 @@ LIBS+=$(PNG_LDFLAGS)
|
||||||
CFLAGS+=$(PNG_CFLAGS)
|
CFLAGS+=$(PNG_CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef HAVE_LIBGME
|
|
||||||
OPTS+=-DHAVE_LIBGME
|
|
||||||
|
|
||||||
ZLIB_PKGCONFIG?=zlib
|
ZLIB_PKGCONFIG?=zlib
|
||||||
ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
|
ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
|
||||||
ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
|
ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
|
||||||
|
@ -328,6 +325,9 @@ ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
|
||||||
LIBS+=$(ZLIB_LDFLAGS)
|
LIBS+=$(ZLIB_LDFLAGS)
|
||||||
CFLAGS+=$(ZLIB_CFLAGS)
|
CFLAGS+=$(ZLIB_CFLAGS)
|
||||||
|
|
||||||
|
ifdef HAVE_LIBGME
|
||||||
|
OPTS+=-DHAVE_LIBGME
|
||||||
|
|
||||||
LIBGME_PKGCONFIG?=libgme
|
LIBGME_PKGCONFIG?=libgme
|
||||||
LIBGME_CFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --cflags)
|
LIBGME_CFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --cflags)
|
||||||
LIBGME_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --libs)
|
LIBGME_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --libs)
|
||||||
|
|
Loading…
Reference in a new issue