added test for cancelled END_EDIT

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

diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index b437a2c7524fcbda65e45ee6179ca277feffc133..acd5c3c42c819f65fc813aa2f0134b3145c65d50 100644 (file)
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -40,6 +40,7 @@ DISPLAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(srcdir)/../../samples $(CXXFLAGS)
 DISPLAY_OBJECTS =  \
        $(__display___win32rc) \
        -I$(srcdir)/../../samples $(CXXFLAGS)
 DISPLAY_OBJECTS =  \
        $(__display___win32rc) \

+       $(__display_os2_lib_res) \

        display_display.o
 LIBDIRNAME = $(top_builddir)lib
 WX_VERSION = 2.5.1
        display_display.o
 LIBDIRNAME = $(top_builddir)lib
 WX_VERSION = 2.5.1


@@ -99,6 +100,8 @@ COND_PLATFORM_OS2_1___display___os2_emxbindcmd = $(NM) display$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__display___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___display___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__display_bundle___depname = display_bundle
 @COND_PLATFORM_OS2_1@__display___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___display___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__display_bundle___depname = display_bundle

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

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


@@ -135,8 +138,8 @@ display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f display$(EXEEXT) display.app/Contents/MacOS/display
        
        
        ln -f display$(EXEEXT) display.app/Contents/MacOS/display
        
        

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

 
 @COND_PLATFORM_MACOSX_1@display_bundle: display.app/Contents/PkgInfo
 
 
 @COND_PLATFORM_MACOSX_1@display_bundle: display.app/Contents/PkgInfo