added CanConvert()

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

diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index 4fcca0e3bc98cab528b37097d907e4d6f17e2a1c..77978d94612de00b3fba95758ada99317ff68fa9 100644 (file)
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -36,10 +36,10 @@ top_srcdir = @top_srcdir@
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib

-MDI_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)

 MDI_OBJECTS =  \
 MDI_OBJECTS =  \

+       $(__mdi_os2_lib_res) \

        mdi_mdi.o \
        $(__mdi___win32rc)
 WX_VERSION = 2.5.1
        mdi_mdi.o \
        $(__mdi___win32rc)
 WX_VERSION = 2.5.1


@@ -98,6 +98,8 @@ COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd = $(NM) mdi$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__mdi___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__mdi___win32rc = mdi_mdi_rc.o
 @COND_PLATFORM_MACOSX_1@__mdi_bundle___depname = mdi_bundle
 @COND_PLATFORM_OS2_1@__mdi___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___mdi___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__mdi___win32rc = mdi_mdi_rc.o
 @COND_PLATFORM_MACOSX_1@__mdi_bundle___depname = mdi_bundle

+@COND_PLATFORM_OS2_1@__mdi_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res

 
 ### Targets: ###
 
 
 ### Targets: ###
 


@@ -141,8 +143,8 @@ mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        ln -f mdi$(EXEEXT) mdi.app/Contents/MacOS/mdi
        
        
        ln -f mdi$(EXEEXT) mdi.app/Contents/MacOS/mdi
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc mdi.app/Contents/Resources/mdi.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns mdi.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc mdi.app/Contents/Resources/mdi.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns mdi.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@mdi_bundle: mdi.app/Contents/PkgInfo
 
 
 @COND_PLATFORM_MACOSX_1@mdi_bundle: mdi.app/Contents/PkgInfo