Added IsEditCancelled/SetEditCanceled

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

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 709195f626c164a595b02ea0401c337bf1fe6442..66e1392b3996cbcd53eba478a0db7c7dc99eb1ba 100644 (file)
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -35,10 +35,11 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 DESTDIR = 
-LAYOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 LAYOUT_OBJECTS =  \
+       $(__layout_os2_lib_res) \
        layout_layout.o \
        $(__layout___win32rc)
 LIBDIRNAME = $(top_builddir)lib
@@ -99,6 +100,8 @@ COND_PLATFORM_OS2_1___layout___os2_emxbindcmd = $(NM) layout$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__layout___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___layout___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__layout___win32rc = layout_layout_rc.o
 @COND_PLATFORM_MACOSX_1@__layout_bundle___depname = layout_bundle
+@COND_PLATFORM_OS2_1@__layout_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -142,8 +145,8 @@ layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
        ln -f layout$(EXEEXT) layout.app/Contents/MacOS/layout
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc layout.app/Contents/Resources/layout.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns layout.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc layout.app/Contents/Resources/layout.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns layout.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@layout_bundle: layout.app/Contents/PkgInfo