Compilation fixes

[wxWidgets.git] / contrib / samples / plot / Makefile.in

diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in
index 40655bd8ad6af3049249c7543f3f33d44df2a4cb..a2b628846053f54c50e946df8d804015a66b6189 100644 (file)
--- a/contrib/samples/plot/Makefile.in
+++ b/contrib/samples/plot/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     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!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -94,13 +94,14 @@ 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_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 \
 @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 -i $(srcdir)/../../include -o plot$(EXEEXT) \
-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(srcdir)/../../../samples -i $(top_srcdir)/include -i \
+       $(srcdir)/../../include -o plot$(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: ###
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###


@@ -129,7 +130,7 @@ plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc)
        $(__plot___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__plot___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

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

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


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

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

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


@@ -148,7 +149,7 @@ plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        
        
        ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc plot.app/Contents/Resources/plot.rsrc
        
        
        ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc plot.app/Contents/Resources/plot.rsrc

-       ln -sf $(top_srcdir)/src/mac/wxmac.icns plot.app/Contents/Resources/wxmac.icns
+       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns plot.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@plot_bundle: plot.app/Contents/PkgInfo
 
 
 @COND_PLATFORM_MACOSX_1@plot_bundle: plot.app/Contents/PkgInfo
 


@@ -156,7 +157,7 @@ plot_plot.o: $(srcdir)/plot.cpp
        $(CXXC) -c -o $@ $(PLOT_CXXFLAGS) $<
 
 plot_plot_rc.o: $(srcdir)/plot.rc
        $(CXXC) -c -o $@ $(PLOT_CXXFLAGS) $<
 
 plot_plot_rc.o: $(srcdir)/plot.rc

-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include
+       $(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-dir $(srcdir)/../../include

 
 
 # Include dependency info, if present:
 
 
 # Include dependency info, if present: