Patch #940808: Updated list of contributors according to the list available at www...

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

diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 2802c36b41f1e7ce41f5bfcff8db099cab286e51..ae7bbacacc5a9722cbd02768991051e6f4505503 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/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!
 # =========================================================================
 
@@ -98,12 +98,12 @@ 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 grid$(EXEEXT) Carbon.r \
+       $(srcdir)/../../samples -i $(top_srcdir)/include -o grid$(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)
 
@@ -133,7 +133,7 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
        $(__grid___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p grid.app/Contents
        mkdir -p grid.app/Contents/MacOS
        mkdir -p grid.app/Contents/Resources
@@ -142,7 +142,7 @@ grid.app/Contents/PkgInfo: grid$(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/grid/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >grid.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >grid.app/Contents/Info.plist
        
        
        echo -n "APPL????" >grid.app/Contents/PkgInfo
@@ -152,7 +152,7 @@ grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        
        
        ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc grid.app/Contents/Resources/grid.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns grid.app/Contents/Resources/wxmac.icns
+       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns grid.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@grid_bundle: grid.app/Contents/PkgInfo
 
@@ -160,7 +160,7 @@ grid_griddemo.o: $(srcdir)/griddemo.cpp
        $(CXXC) -c -o $@ $(GRID_CXXFLAGS) $<
 
 grid_griddemo_rc.o: $(srcdir)/griddemo.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: