wxToggleButton on wxMac has these methods now

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

diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in
index b7e8ed9b0d5ab3e8f37b7f875837c8e21e4d7f6c..cfaf99ee395a5095ed054b405638131a537df633 100644 (file)
--- a/samples/minifram/Makefile.in
+++ b/samples/minifram/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!
 # =========================================================================
 
@@ -93,13 +93,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 minifram$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(srcdir)/../../samples -i $(top_srcdir)/include -o minifram$(EXEEXT) \
+       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -128,7 +128,7 @@ minifram$(EXEEXT): $(MINIFRAM_OBJECTS) $(__minifram___win32rc)
        $(__minifram___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p minifram.app/Contents
        mkdir -p minifram.app/Contents/MacOS
        mkdir -p minifram.app/Contents/Resources
@@ -137,7 +137,7 @@ minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/minifram/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >minifram.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >minifram.app/Contents/Info.plist
        
        
        echo -n "APPL????" >minifram.app/Contents/PkgInfo
@@ -147,7 +147,7 @@ minifram.app/Contents/PkgInfo: minifram$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        
        
        ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc minifram.app/Contents/Resources/minifram.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns minifram.app/Contents/Resources/wxmac.icns
+       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns minifram.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@minifram_bundle: minifram.app/Contents/PkgInfo
 
@@ -155,7 +155,7 @@ minifram_minifram.o: $(srcdir)/minifram.cpp
        $(CXXC) -c -o $@ $(MINIFRAM_CXXFLAGS) $<
 
 minifram_minifram_rc.o: $(srcdir)/minifram.rc
-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+       $(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
 
 
 # Include dependency info, if present: