Patch #808669 more warngins and unicode fixes

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

diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in
index 23f38127e1d6e78b0e1a27e9171e66d5b756f28b..44a6bf5059b182952869643dda271dd1b9c54912 100644 (file)
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -20,6 +20,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 PIC_FLAG = @PIC_FLAG@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
@@ -48,14 +49,14 @@ RENDER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 RENDER_OBJECTS =  \
        $(__render___win32rc) \
        render_render.o
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
-@COND_PLATFORM_UNIX_0@PLUGIN_VERSION = 250
-@COND_PLATFORM_UNIX_1@PLUGIN_VERSION = -2.5.0
+@COND_PLATFORM_UNIX_0@PLUGIN_VERSION = 251
+@COND_PLATFORM_UNIX_1@PLUGIN_VERSION = -2.5.1
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -87,7 +88,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 render$(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)
@@ -106,6 +107,9 @@ COND_SHARED_1___renddll___depname = \
 @COND_PLATFORM_MAC_1@__render___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__render___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C render$(EXEEXT)
+COND_PLATFORM_OS2_1___render___os2_emxbindcmd = $(NM) render$(EXEEXT) | if grep \
+       -q pmwin.763 ; then emxbind -ep render$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__render___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___render___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__render___win32rc = render_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__render_bundle___depname = render_bundle
 
@@ -128,18 +132,19 @@ install: all
 install-strip: install
 
 @COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
-@COND_SHARED_1@        $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(__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_SHARED_1@        $(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(__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)
 
 renddll_renddll.o: $(srcdir)/renddll.cpp
        $(CXXC) -c -o $@ $(RENDDLL_CXXFLAGS) $<
 
 render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
-       $(CXX) -o $@ $(RENDER_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 $@ $(RENDER_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)
        $(__render___mac_rezcmd)
        $(__render___mac_setfilecmd)
+       $(__render___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-render.app/Contents: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p render.app/Contents
        mkdir -p render.app/Contents/MacOS
        mkdir -p render.app/Contents/Resources
@@ -157,16 +162,16 @@ render.app/Contents: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
        ln -f render$(EXEEXT) render.app/Contents/MacOS/render
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc render.app/Contents/Resources/render.rsrc
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc render.app/Contents/Resources/render.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns render.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@render_bundle: render.app/Contents
+@COND_PLATFORM_MACOSX_1@render_bundle: render.app/Contents/PkgInfo
 
 render_render.o: $(srcdir)/render.cpp
        $(CXXC) -c -o $@ $(RENDER_CXXFLAGS) $<
 
 render_sample_rc.o: $(srcdir)/../../samples/sample.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
 
 uninstall: