made GetTextExtent() work correctly with NULL theFont parameter (m_font might nto...

[wxWidgets.git] / samples / wizard / Makefile.in

diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 4052d0f53436f7a6891ef7caaede788077c944eb..432fee2ec083e5c9642e8166199b4f819ae1ba58 100644 (file)
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -72,6 +72,10 @@ COND_PLATFORM_OS2_1___wizard___os2_emxbindcmd = $(NM) wizard$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__wizard_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__wizard_bundle___depname = wizard_bundle
+@COND_TOOLKIT_COCOA@____wizard_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   wizard.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____wizard_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     wizard.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)
@@ -104,7 +108,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 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 -i $(top_srcdir)/include -o wizard$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -133,7 +137,7 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
        $(__wizard___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p wizard.app/Contents
        mkdir -p wizard.app/Contents/MacOS
        mkdir -p wizard.app/Contents/Resources
@@ -151,10 +155,10 @@ wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
        ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc wizard.app/Contents/Resources/wizard.rsrc
-       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc wizard.app/Contents/Resources/wizard.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wizard.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@wizard_bundle: wizard.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@wizard_bundle: $(____wizard_BUNDLE_TGT_REF_DEP)
 
 wizard_wizard.o: $(srcdir)/wizard.cpp
        $(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $<