Applied patch [ 845171 ] Use transparancy mask in wxBitmapShape

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

diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index d2e26f575e685cfa820d8ff2483eb4ad32229a07..5bdf6e9fce7971511aa20e29e2aa552071fbe738 100644 (file)
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -34,10 +34,11 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-CARET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 CARET_OBJECTS =  \
+       $(__caret_os2_lib_res) \
        caret_caret.o \
        $(__caret___win32rc)
 DESTDIR = 
@@ -99,6 +100,8 @@ COND_PLATFORM_OS2_1___caret___os2_emxbindcmd = $(NM) caret$(EXEEXT) | if grep -q
 @COND_PLATFORM_OS2_1@__caret___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___caret___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__caret___win32rc = caret_caret_rc.o
 @COND_PLATFORM_MACOSX_1@__caret_bundle___depname = caret_bundle
+@COND_PLATFORM_OS2_1@__caret_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -129,8 +132,8 @@ caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
        ln -f caret$(EXEEXT) caret.app/Contents/MacOS/caret
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc caret.app/Contents/Resources/caret.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns caret.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc caret.app/Contents/Resources/caret.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns caret.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@caret_bundle: caret.app/Contents/PkgInfo