Some wx.* fixes

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

diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index 35257681a46b84b21fa4e71f1fda21a683408159..ed5371c8a3a6ab5f637700cb5aad7eca12745e8b 100644 (file)
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -13,11 +13,13 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 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@
@@ -32,17 +34,21 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-DRAWING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DESTDIR = 
+DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 DRAWING_OBJECTS =  \
+       $(__drawing_os2_lib_res) \
        drawing_drawing.o \
        $(__drawing___win32rc)
 LIBDIRNAME = $(top_builddir)lib
-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_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -72,8 +78,8 @@ WX_VERSION = 2.5.0
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 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 drawing Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o drawing$(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)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -87,18 +93,24 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__drawing___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = $(SETFILE) -a C drawing
+@COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C drawing$(EXEEXT)
+COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd = $(NM) drawing$(EXEEXT) | if \
+       grep -q pmwin.763 ; then emxbind -ep drawing$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__drawing___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___drawing___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__drawing___win32rc = drawing_drawing_rc.o
 @COND_PLATFORM_MACOSX_1@__drawing_bundle___depname = drawing_bundle
+@COND_PLATFORM_OS2_1@__drawing_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
-all: drawing $(__drawing_bundle___depname) data
+all: drawing$(EXEEXT) $(__drawing_bundle___depname) data
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f drawing
+       rm -f drawing$(EXEEXT)
        rm -rf drawing.app
 
 data: 
@@ -112,13 +124,14 @@ data:
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
-drawing: $(DRAWING_OBJECTS) $(__drawing___win32rc)
-       $(CXX) -o $@ $(DRAWING_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)
+drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
+       $(CXX) -o $@ $(DRAWING_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)
        $(__drawing___mac_rezcmd)
        $(__drawing___mac_setfilecmd)
+       $(__drawing___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-drawing.app/Contents: drawing $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p drawing.app/Contents
        mkdir -p drawing.app/Contents/MacOS
        mkdir -p drawing.app/Contents/Resources
@@ -133,19 +146,19 @@ drawing.app/Contents: drawing $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/
        echo -n "APPL????" >drawing.app/Contents/PkgInfo
        
        
-       ln -f drawing drawing.app/Contents/MacOS/drawing
+       ln -f drawing$(EXEEXT) drawing.app/Contents/MacOS/drawing
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc drawing.app/Contents/Resources/drawing.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns drawing.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc drawing.app/Contents/Resources/drawing.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns drawing.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@drawing_bundle: drawing.app/Contents
+@COND_PLATFORM_MACOSX_1@drawing_bundle: drawing.app/Contents/PkgInfo
 
 drawing_drawing.o: $(srcdir)/drawing.cpp
-       $(CXX) -c -o $@ $(DRAWING_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(DRAWING_CXXFLAGS) $<
 
 drawing_drawing_rc.o: $(srcdir)/drawing.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
 
 install: all