1. fixed --with-libxpm switch handling, added it to the summary

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

diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in
index 9e8f9163ba2059c9210d947f3570ac938cd9b04a..512f49f9958be9dc0393f91e367ee57b20552c8d 100644 (file)
--- a/samples/mfc/Makefile.in
+++ b/samples/mfc/Makefile.in
@@ -34,11 +34,13 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-MFCTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+MFCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 MFCTEST_OBJECTS =  \
+       $(__mfctest_os2_lib_res) \
        mfctest_mfctest.o \
        $(__mfctest___win32rc)
 WX_VERSION = 2.5.1
@@ -98,6 +100,8 @@ COND_PLATFORM_OS2_1___mfctest___os2_emxbindcmd = $(NM) mfctest$(EXEEXT) | if \
 @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: ###
 
@@ -141,8 +145,8 @@ mfctest.app/Contents/PkgInfo: mfctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f mfctest$(EXEEXT) mfctest.app/Contents/MacOS/mfctest
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.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/PkgInfo