compilation fix for tooltip patch code applied by Julian and w32api

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

diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in
index 9c15b66d06c09ec12dc8bc445de275a99df6a8a7..143fc2516f493fe5dbd7fadd8ce17ca383d058c4 100644 (file)
--- a/samples/mfc/Makefile.in
+++ b/samples/mfc/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,20 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-MFCTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+MFCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 MFCTEST_OBJECTS =  \
+       $(__mfctest_os2_lib_res) \
        mfctest_mfctest.o \
        $(__mfctest___win32rc)
-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
@@ -71,9 +76,9 @@ WX_VERSION = 2.5.0
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @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 mfctest Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../samples -o mfctest$(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 +92,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@__mfctest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__mfctest___mac_setfilecmd = $(SETFILE) -a C mfctest
+@COND_PLATFORM_MAC_1@__mfctest___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C mfctest$(EXEEXT)
+COND_PLATFORM_OS2_1___mfctest___os2_emxbindcmd = $(NM) mfctest$(EXEEXT) | if \
+       grep -q pmwin.763 ; then emxbind -ep mfctest$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__mfctest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mfctest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__mfctest___win32rc = mfctest_mfctest_rc.o
 @COND_PLATFORM_MACOSX_1@__mfctest_bundle___depname = mfctest_bundle
+@COND_PLATFORM_OS2_1@__mfctest_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
-all: mfctest $(__mfctest_bundle___depname)
+all: mfctest$(EXEEXT) $(__mfctest_bundle___depname)
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f mfctest
+       rm -f mfctest$(EXEEXT)
        rm -rf mfctest.app
 
 distclean: clean
@@ -108,13 +119,14 @@ install: all
 
 install-strip: install
 
-mfctest: $(MFCTEST_OBJECTS) $(__mfctest___win32rc)
-       $(CXX) -o $@ $(MFCTEST_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)
+mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc)
+       $(CXX) -o $@ $(MFCTEST_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)
        $(__mfctest___mac_rezcmd)
        $(__mfctest___mac_setfilecmd)
+       $(__mfctest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-mfctest.app/Contents: mfctest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p mfctest.app/Contents
        mkdir -p mfctest.app/Contents/MacOS
        mkdir -p mfctest.app/Contents/Resources
@@ -129,19 +141,19 @@ mfctest.app/Contents: mfctest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/
        echo -n "APPL????" >mfctest.app/Contents/PkgInfo
        
        
-       ln -f mfctest mfctest.app/Contents/MacOS/mfctest
+       ln -f mfctest$(EXEEXT) mfctest.app/Contents/MacOS/mfctest
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mfctest.app/Contents/Resources/mfctest.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns mfctest.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc mfctest.app/Contents/Resources/mfctest.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns mfctest.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@mfctest_bundle: mfctest.app/Contents
+@COND_PLATFORM_MACOSX_1@mfctest_bundle: mfctest.app/Contents/PkgInfo
 
 mfctest_mfctest.o: $(srcdir)/mfctest.cpp
-       $(CXX) -c -o $@ $(MFCTEST_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(MFCTEST_CXXFLAGS) $<
 
 mfctest_mfctest_rc.o: $(srcdir)/mfctest.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 $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 uninstall: