added CanConvert()

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

diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 922acfe327d8b56bfe2f2cc5ed20f94fe7eb36e9..81ce42a5acdb40cdf6b62acfbab003d794125b7f 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -34,10 +34,12 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-GRID_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DESTDIR = 
+GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 GRID_OBJECTS =  \
+       $(__grid_os2_lib_res) \
        grid_griddemo.o \
        $(__grid___win32rc)
 LIBDIRNAME = $(top_builddir)lib
@@ -101,6 +103,8 @@ COND_PLATFORM_OS2_1___grid___os2_emxbindcmd = $(NM) grid$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__grid___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___grid___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__grid___win32rc = grid_griddemo_rc.o
 @COND_PLATFORM_MACOSX_1@__grid_bundle___depname = grid_bundle
+@COND_PLATFORM_OS2_1@__grid_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -140,8 +144,8 @@ grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc grid.app/Contents/Resources/grid.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns grid.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc grid.app/Contents/Resources/grid.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns grid.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@grid_bundle: grid.app/Contents/PkgInfo