From 5d52be919a57d4521ecca6ac7a27a3a9d39d7783 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 12 Jun 2007 22:29:27 +0000 Subject: [PATCH] revert linking change, because that's not obviously the right place svn: r6610 --- src/mred/Makefile.in | 2 +- src/mred/gc2/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mred/Makefile.in b/src/mred/Makefile.in index 600b34696a..234a80deec 100644 --- a/src/mred/Makefile.in +++ b/src/mred/Makefile.in @@ -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@ diff --git a/src/mred/gc2/Makefile.in b/src/mred/gc2/Makefile.in index 5334e804b6..7b51b0c60d 100644 --- a/src/mred/gc2/Makefile.in +++ b/src/mred/gc2/Makefile.in @@ -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@