X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92b4653a62298a667f1725e7ea90418ae4743e04..b640fa17f3359e2766232e5dae3922de28236bde:/samples/opengl/isosurf/Makefile.in diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index 86d39aba2a..b3bf1c9569 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -30,6 +30,7 @@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ EXTRALIBS = @EXTRALIBS@ +EXTRALIBS_XML = @EXTRALIBS_XML@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ CXXWARNINGS = @CXXWARNINGS@ @@ -41,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.9 -WX_VERSION = $(WX_RELEASE).3 +WX_VERSION = $(WX_RELEASE).5 LIBDIRNAME = $(wx_top_builddir)/lib ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -63,7 +64,8 @@ ISOSURF_OBJECTS = \ @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) -@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \ +@COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_USE_OPENGL_1@__isosurf___depname = isosurf$(EXEEXT) @@ -167,7 +169,7 @@ distclean: clean @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >isosurf.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ echo -n "APPL????" >isosurf.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ /bin/echo "APPL????" >isosurf.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf