X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/95ff11c4bb0b4a58f86f096871489b5723e2102c..d5cc191c9cd48a915ce0dfc6e49511b2fddb6746:/samples/grid/Makefile.in diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 7d45710a46..e4be5b134f 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.9 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -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_SDL = @EXTRALIBS_SDL@ CXXWARNINGS = @CXXWARNINGS@ @@ -41,16 +42,16 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 2.9 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).4 LIBDIRNAME = $(wx_top_builddir)/lib -GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \ $(CPPFLAGS) $(CXXFLAGS) GRID_OBJECTS = \ + $(__grid___win32rc) \ $(__grid_os2_lib_res) \ - grid_griddemo.o \ - $(__grid___win32rc) + grid_griddemo.o ### Conditionally set variables: ### @@ -60,12 +61,12 @@ GRID_OBJECTS = \ @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon -@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d -@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d +@COND_BUILD_debug@WXDEBUGFLAG = d @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_PLATFORM_MAC_0@__grid___mac_setfilecmd = @true @@ -73,6 +74,8 @@ GRID_OBJECTS = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL grid$(EXEEXT) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI @@ -86,6 +89,7 @@ COND_PLATFORM_OS2_1___grid___os2_emxbindcmd = $(NM) grid$(EXEEXT) | if grep -q \ @COND_PLATFORM_OS2_1@__grid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___grid___os2_emxbindcmd) @COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) +@COND_PLATFORM_WIN32_1@__grid___win32rc = grid_sample_rc.o @COND_PLATFORM_OS2_1@__grid_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__grid_app_Contents_PkgInfo___depname \ @@ -110,7 +114,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) -@COND_PLATFORM_WIN32_1@__grid___win32rc = grid_griddemo_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -168,31 +171,22 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) @COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >grid.app/Contents/Info.plist @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >grid.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >grid.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ mv grid$(EXEEXT) grid.app/Contents/MacOS/grid +@COND_PLATFORM_MACOSX_1@ ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns grid.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@grid_bundle: $(____grid_BUNDLE_TGT_REF_DEP) +grid_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include + grid_griddemo.o: $(srcdir)/griddemo.cpp $(CXXC) -c -o $@ $(GRID_CXXFLAGS) $(srcdir)/griddemo.cpp -grid_griddemo_rc.o: $(srcdir)/griddemo.rc - $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include - - -@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \ -@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \ -@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \ -@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \ -@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py -@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py -@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \ -@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d