Patch #808669 more warngins and unicode fixes

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

diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index 10f0d485230bfd00189143893648faf54f126c65..84eb0a353bdd92ac9d2bbf2f579ced4c4242dce5 100644 (file)
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -40,7 +41,7 @@ ACCESSTEST_OBJECTS =  \
        accesstest_accesstest.o \
        $(__accesstest___win32rc)
 LIBDIRNAME = $(top_builddir)lib
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -76,7 +77,7 @@ WX_VERSION = 2.5.0
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o accesstest$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -92,6 +93,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__accesstest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C accesstest$(EXEEXT)
+COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd = $(NM) accesstest$(EXEEXT) \
+       | if grep -q pmwin.763 ; then emxbind -ep accesstest$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__accesstest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___accesstest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_accesstest_rc.o
 @COND_PLATFORM_MACOSX_1@__accesstest_bundle___depname = accesstest_bundle
 
@@ -100,12 +104,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 all: accesstest$(EXEEXT) $(__accesstest_bundle___depname)
 
 accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
-       $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
+       $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
        $(__accesstest___mac_rezcmd)
        $(__accesstest___mac_setfilecmd)
+       $(__accesstest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p accesstest.app/Contents
        mkdir -p accesstest.app/Contents/MacOS
        mkdir -p accesstest.app/Contents/Resources
@@ -123,14 +128,14 @@ accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/mac/Info.
        ln -f accesstest$(EXEEXT) accesstest.app/Contents/MacOS/accesstest
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc accesstest.app/Contents/Resources/accesstest.rsrc
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc accesstest.app/Contents/Resources/accesstest.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns accesstest.app/Contents/Resources/wxmac.icns
 
 accesstest_accesstest.o: $(srcdir)/accesstest.cpp
        $(CXXC) -c -o $@ $(ACCESSTEST_CXXFLAGS) $<
 
 accesstest_accesstest_rc.o: $(srcdir)/accesstest.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 @COND_PLATFORM_MACOSX_1@accesstest_bundle: accesstest.app/Contents/PkgInfo