revert linking change, because that's not obviously the right place
svn: r6610
This commit is contained in:
parent
e3e5212ea7
commit
5d52be919a
|
@ -59,7 +59,7 @@ ZLIB_INC = -I$(srcdir)/../wxcommon/zlib
|
|||
PNG_A = ../wxcommon/libpng/libpng.@LIBSFX@
|
||||
|
||||
EXTRALDFLAGS_wx_xt =
|
||||
EXTRALDFLAGS_wx_mac = -framework Carbon -framework Cocoa -framework QuickTime -framework AGL -framework OpenGL -lz -lobjc
|
||||
EXTRALDFLAGS_wx_mac = -framework Carbon -framework Cocoa -framework QuickTime -framework AGL -framework OpenGL -lz
|
||||
MREDLDFLAGS = $(LDFLAGS) $(EXTRALDFLAGS_@WXVARIANT@)
|
||||
WXLIBS_wx_xt = ../wxxt/src/libwx_xt.@LIBSFX@ ../wxxt/contrib/xpm/lib/libXpm.@LIBSFX@ ../wxxt/utils/image/src/libimage_xt.@LIBSFX@
|
||||
MREDX_wx_xt = mredx.@LTO@
|
||||
|
|
|
@ -1341,7 +1341,7 @@ wx_font.o : $(srcdir)/../../wxmac/src/mac/wx_font.m
|
|||
$(CXX) -o wx_font.o -c $(srcdir)/../../wxmac/src/mac/wx_font.m
|
||||
|
||||
wx_xt_LIBS = ../../wxxt/contrib/xpm/lib/libXpm.@LTA@ @JPEG_A@ @PNG_A@ @ZLIB_A@
|
||||
wx_mac_LIBS = -framework Carbon -framework Cocoa -framework QuickTime -framework AGL -framework OpenGL @JPEG_A@ @PNG_A@ -lz -lobjc @LIBS@
|
||||
wx_mac_LIBS = -framework Carbon -framework Cocoa -framework QuickTime -framework AGL -framework OpenGL @JPEG_A@ @PNG_A@ -lz @LIBS@
|
||||
|
||||
MREDLINKER = @MREDLINKER@
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user