-1->wxID_ANY, ambiguity of types.

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

diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
index 8bc6c4c8d87932a27517f702267444e1092c33a1..fff3192054cd3014ace83e871d6aa60001333e67 100644 (file)
--- a/samples/db/Makefile.in
+++ b/samples/db/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!
 # =========================================================================
 
@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 DBTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -73,6 +73,13 @@ COND_PLATFORM_OS2_1___dbtest___os2_emxbindcmd = $(NM) dbtest$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__dbtest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__dbtest_bundle___depname = dbtest_bundle
+@COND_TOOLKIT_COCOA@____dbtest_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   dbtest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____dbtest_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     dbtest.app/Contents/PkgInfo
+COND_MONOLITHIC_0___WXLIB_DBGRID_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_DBGRID_p = $(COND_MONOLITHIC_0___WXLIB_DBGRID_p)
 COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p = \
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_USE_ODBC_1@__WXLIB_ODBC_p = $(COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p)
@@ -99,13 +106,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 dbtest$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(srcdir)/../../samples -i $(top_srcdir)/include -o dbtest$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -128,13 +135,13 @@ distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_USE_ODBC_1@dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc)
-@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
 @COND_USE_ODBC_1@      $(__dbtest___mac_rezcmd)
 @COND_USE_ODBC_1@      $(__dbtest___mac_setfilecmd)
 @COND_USE_ODBC_1@      $(__dbtest___os2_emxbindcmd)
 @COND_USE_ODBC_1@      $(SAMPLES_RPATH_POSTLINK)
 
-dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p dbtest.app/Contents
        mkdir -p dbtest.app/Contents/MacOS
        mkdir -p dbtest.app/Contents/Resources
@@ -143,7 +150,7 @@ dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/Info.pl
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/dbtest/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >dbtest.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >dbtest.app/Contents/Info.plist
        
        
        echo -n "APPL????" >dbtest.app/Contents/PkgInfo
@@ -152,10 +159,10 @@ dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/Info.pl
        ln -f dbtest$(EXEEXT) dbtest.app/Contents/MacOS/dbtest
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dbtest.app/Contents/Resources/dbtest.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns dbtest.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc dbtest.app/Contents/Resources/dbtest.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dbtest.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@dbtest_bundle: dbtest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@dbtest_bundle: $(____dbtest_BUNDLE_TGT_REF_DEP)
 
 dbtest_dbtest.o: $(srcdir)/dbtest.cpp
        $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $<
@@ -164,7 +171,7 @@ dbtest_listdb.o: $(srcdir)/listdb.cpp
        $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $<
 
 dbtest_dbtest_rc.o: $(srcdir)/dbtest.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: