X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b17c1746930b29c13d5bfff0009721cbcefa53f1..4aa0bd9b3138e44656cc6669f1b4c3bdcf252bfa:/samples/taskbar/Makefile.in diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index 7cb9b62d6a..896f1a7121 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.2 (http://bakefile.sourceforge.net) +# Bakefile 0.1.4 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -28,6 +28,7 @@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ +EXTRALIBS_SDL = @EXTRALIBS_SDL@ HOST_SUFFIX = @HOST_SUFFIX@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ @@ -35,19 +36,20 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ ### Variables: ### DESTDIR = -WX_VERSION = 2.5.1 +WX_VERSION = 2.5.2 LIBDIRNAME = $(top_builddir)lib TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) TASKBAR_OBJECTS = \ + $(__taskbar___win32rc) \ $(__taskbar_os2_lib_res) \ - taskbar_tbtest.o \ - $(__taskbar___win32rc) + taskbar_tbtest.o ### Conditionally set variables: ### @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -67,9 +69,14 @@ TASKBAR_OBJECTS = \ COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd = $(NM) taskbar$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep taskbar$(EXEEXT) ; fi @COND_PLATFORM_OS2_1@__taskbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd) +@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_sample_rc.o @COND_PLATFORM_OS2_1@__taskbar_os2_lib_res = \ @COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res @COND_PLATFORM_MACOSX_1@__taskbar_bundle___depname = taskbar_bundle +@COND_TOOLKIT_COCOA@____taskbar_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_COCOA@ taskbar.app/Contents/PkgInfo +@COND_TOOLKIT_MAC@____taskbar_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_MAC@ taskbar.app/Contents/PkgInfo COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p) @@ -78,7 +85,6 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \ @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) -@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_tbtest_rc.o COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @@ -96,13 +102,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ @COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ -@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) +@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ - $(srcdir)/../../samples -o taskbar$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + $(srcdir)/../../samples -i $(top_srcdir)/include -o taskbar$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) ### Targets: ### @@ -125,13 +131,13 @@ distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) - $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__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 $@ $(TASKBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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) $(__taskbar___mac_rezcmd) $(__taskbar___mac_setfilecmd) $(__taskbar___os2_emxbindcmd) $(SAMPLES_RPATH_POSTLINK) -taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns +taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p taskbar.app/Contents mkdir -p taskbar.app/Contents/MacOS mkdir -p taskbar.app/Contents/Resources @@ -140,7 +146,7 @@ taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/taskbar/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >taskbar.app/Contents/Info.plist + $(top_srcdir)/src/mac/carbon/Info.plist.in >taskbar.app/Contents/Info.plist echo -n "APPL????" >taskbar.app/Contents/PkgInfo @@ -149,17 +155,17 @@ taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist. ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar - ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc taskbar.app/Contents/Resources/taskbar.rsrc - ln -sf $(top_srcdir)/src/mac/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns + cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc taskbar.app/Contents/Resources/taskbar.rsrc + cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@taskbar_bundle: taskbar.app/Contents/PkgInfo +@COND_PLATFORM_MACOSX_1@taskbar_bundle: $(____taskbar_BUNDLE_TGT_REF_DEP) + +taskbar_sample_rc.o: $(srcdir)/../../samples/sample.rc + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include taskbar_tbtest.o: $(srcdir)/tbtest.cpp $(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $< -taskbar_tbtest_rc.o: $(srcdir)/tbtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples - # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d