Unconditionally add -lz to WX_LIBS
Originally committed to SVN as r6885.
This commit is contained in:
parent
9cb5178c4b
commit
c6237865af
2 changed files with 1 additions and 2 deletions
|
@ -81,7 +81,7 @@ P_DOC = $(P_DATAROOT)/doc/aegisub/
|
||||||
CFLAGS_WX = @WX_CFLAGS@
|
CFLAGS_WX = @WX_CFLAGS@
|
||||||
CXXFLAGS_WX = @WX_CXXFLAGS@
|
CXXFLAGS_WX = @WX_CXXFLAGS@
|
||||||
CPPFLAGS_WX = @WX_CPPFLAGS@
|
CPPFLAGS_WX = @WX_CPPFLAGS@
|
||||||
LIBS_WX = @WX_LIBS@
|
LIBS_WX = @WX_LIBS@ -lz
|
||||||
|
|
||||||
CFLAGS_FFMS2 = @FFMS2_CFLAGS@
|
CFLAGS_FFMS2 = @FFMS2_CFLAGS@
|
||||||
CFLAGS_FFTW3 = @FFTW3_CFLAGS@
|
CFLAGS_FFTW3 = @FFTW3_CFLAGS@
|
||||||
|
|
|
@ -19,7 +19,6 @@ LIBS += $(LIBS_UCHARDET)
|
||||||
LDFLAGS += $(LDFLAGS_CCMALLOC)
|
LDFLAGS += $(LDFLAGS_CCMALLOC)
|
||||||
|
|
||||||
ifeq (yes, $(BUILD_DARWIN))
|
ifeq (yes, $(BUILD_DARWIN))
|
||||||
LIBS += -lz
|
|
||||||
SRC += osx_utils.mm
|
SRC += osx_utils.mm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue