X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b328fad3715dd4a46ce1879e35f7466747503b2d..6757b5e31cb48dd909754fdd5ceb5947585b76e1:/samples/opengl/isosurf/Makefile.in diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index 403e251a1e..b51addea23 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -16,9 +16,11 @@ CXXFLAGS = @CXXFLAGS@ EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@ HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ +NM = @NM@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ @@ -37,10 +39,10 @@ ISOSURF_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../samples $(CXXFLAGS) ISOSURF_OBJECTS = \ - isosurf_isosurf.o \ - $(__isosurf___win32rc) + $(__isosurf___win32rc) \ + isosurf_isosurf.o LIBDIRNAME = $(top_builddir)lib -WX_VERSION = 2.5.0 +WX_VERSION = 2.5.1 ### Conditionally set variables: ### @@ -76,7 +78,7 @@ WX_VERSION = 2.5.0 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o isosurf$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -92,7 +94,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__isosurf___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C isosurf$(EXEEXT) -@COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_cube_rc.o +COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd = $(NM) isosurf$(EXEEXT) | if \ + grep -q pmwin.763 ; then emxbind -ep isosurf$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__isosurf___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___isosurf___os2_emxbindcmd) +@COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_sample_rc.o @COND_PLATFORM_MACOSX_1@__isosurf_bundle___depname = isosurf_bundle ### Targets: ### @@ -121,12 +126,13 @@ install: all install-strip: install isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc) - $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__isosurf___mac_rezcmd) $(__isosurf___mac_setfilecmd) + $(__isosurf___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -isosurf.app/Contents: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +isosurf.app/Contents/PkgInfo: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p isosurf.app/Contents mkdir -p isosurf.app/Contents/MacOS mkdir -p isosurf.app/Contents/Resources @@ -144,17 +150,17 @@ isosurf.app/Contents: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc isosurf.app/Contents/Resources/isosurf.rsrc + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc isosurf.app/Contents/Resources/isosurf.rsrc ln -f $(top_srcdir)/src/mac/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@isosurf_bundle: isosurf.app/Contents - -isosurf_cube_rc.o: $(srcdir)/cube.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples +@COND_PLATFORM_MACOSX_1@isosurf_bundle: isosurf.app/Contents/PkgInfo isosurf_isosurf.o: $(srcdir)/isosurf.cpp $(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $< +isosurf_sample_rc.o: $(srcdir)/../../../samples/sample.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + uninstall: