Applied patch [ 845171 ] Use transparancy mask in wxBitmapShape

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

diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in
index 7cdbee94d94ef5c1fd7b849a9cda06b516f29d56..efb37a3575cc89a9451286f11ecd5e42eeed0209 100644 (file)
--- a/samples/scrollsub/Makefile.in
+++ b/samples/scrollsub/Makefile.in
@@ -34,11 +34,13 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-SCROLLSUB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+SCROLLSUB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 SCROLLSUB_OBJECTS =  \
+       $(__scrollsub_os2_lib_res) \
        scrollsub_scrollsub.o \
        $(__scrollsub___win32rc)
 WX_VERSION = 2.5.1
@@ -98,6 +100,8 @@ COND_PLATFORM_OS2_1___scrollsub___os2_emxbindcmd = $(NM) scrollsub$(EXEEXT) | \
 @COND_PLATFORM_OS2_1@__scrollsub___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___scrollsub___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub_scrollsub_rc.o
 @COND_PLATFORM_MACOSX_1@__scrollsub_bundle___depname = scrollsub_bundle
+@COND_PLATFORM_OS2_1@__scrollsub_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -141,8 +145,8 @@ scrollsub.app/Contents/PkgInfo: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.pl
        ln -f scrollsub$(EXEEXT) scrollsub.app/Contents/MacOS/scrollsub
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc scrollsub.app/Contents/Resources/scrollsub.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns scrollsub.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc scrollsub.app/Contents/Resources/scrollsub.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns scrollsub.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@scrollsub_bundle: scrollsub.app/Contents/PkgInfo