-1->wxID_ANY, TRUE->true and FALSE->false replacements.

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

diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in
index dfe82436738725eb8cdba46a5b5181e83af918cd..2197e8a18e2595b45f69bd05df80aed931881ecb 100644 (file)
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     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!
 # =========================================================================
 
@@ -92,7 +92,7 @@ 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 \
@@ -127,7 +127,7 @@ png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc)
        $(__png___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p png.app/Contents
        mkdir -p png.app/Contents/MacOS
        mkdir -p png.app/Contents/Resources
@@ -136,7 +136,7 @@ png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/png/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >png.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >png.app/Contents/Info.plist
        
        
        echo -n "APPL????" >png.app/Contents/PkgInfo
@@ -146,7 +146,7 @@ png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        
        
        ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc png.app/Contents/Resources/png.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns png.app/Contents/Resources/wxmac.icns
+       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns png.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@png_bundle: png.app/Contents/PkgInfo