documented GetIcon(s), extended SetIcons() doc

[wxWidgets.git] / contrib / samples / gizmos / dynsash / Makefile.in

diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in
index aa6a59756dca462d529326897108b5cb014af331..fa71d434081bf7565d8e07062622d556dd953390 100644 (file)
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
 ### Variables: ###
 
 DESTDIR = 

-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2

 LIBDIRNAME = $(top_builddir)lib
 DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
 LIBDIRNAME = $(top_builddir)lib
 DYNSASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \


@@ -73,6 +73,10 @@ COND_PLATFORM_OS2_1___dynsash___os2_emxbindcmd = $(NM) dynsash$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__dynsash_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__dynsash_bundle___depname = dynsash_bundle
 @COND_PLATFORM_OS2_1@__dynsash_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__dynsash_bundle___depname = dynsash_bundle

+@COND_TOOLKIT_COCOA@____dynsash_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   dynsash.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____dynsash_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     dynsash.app/Contents/PkgInfo

 COND_MONOLITHIC_0___WXLIB_HTML_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)


@@ -105,7 +109,7 @@ 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 -i \
        $(srcdir)/../../../include -o dynsash$(EXEEXT) Carbon.r \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \
        $(srcdir)/../../../include -o dynsash$(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: ###
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###


@@ -134,7 +138,7 @@ dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
        $(__dynsash___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__dynsash___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns

        mkdir -p dynsash.app/Contents
        mkdir -p dynsash.app/Contents/MacOS
        mkdir -p dynsash.app/Contents/Resources
        mkdir -p dynsash.app/Contents
        mkdir -p dynsash.app/Contents/MacOS
        mkdir -p dynsash.app/Contents/Resources


@@ -143,7 +147,7 @@ dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/dynsash/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/dynsash/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >dynsash.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >dynsash.app/Contents/Info.plist

        
        
        echo -n "APPL????" >dynsash.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >dynsash.app/Contents/PkgInfo


@@ -152,10 +156,10 @@ dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f dynsash$(EXEEXT) dynsash.app/Contents/MacOS/dynsash
        
        
        ln -f dynsash$(EXEEXT) dynsash.app/Contents/MacOS/dynsash
        
        

-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dynsash.app/Contents/Resources/dynsash.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns dynsash.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc dynsash.app/Contents/Resources/dynsash.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynsash.app/Contents/Resources/wxmac.icns

 
 

-@COND_PLATFORM_MACOSX_1@dynsash_bundle: dynsash.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@dynsash_bundle: $(____dynsash_BUNDLE_TGT_REF_DEP)

 
 dynsash_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
 
 dynsash_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