Applied patch [ 845171 ] Use transparancy mask in wxBitmapShape

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

diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index 761f279d83cf4d9768ede034678c00542c23552f..8361a43701e568a1144efdd6af13b5daeb783bdd 100644 (file)
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -36,10 +36,11 @@ top_srcdir = @top_srcdir@
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-TYPETEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 TYPETEST_OBJECTS =  \
+       $(__typetest_os2_lib_res) \
        typetest_typetest.o \
        $(__typetest___win32rc)
 WX_VERSION = 2.5.1
@@ -99,6 +100,8 @@ COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd = $(NM) typetest$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__typetest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___typetest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest_typetest_rc.o
 @COND_PLATFORM_MACOSX_1@__typetest_bundle___depname = typetest_bundle
+@COND_PLATFORM_OS2_1@__typetest_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -142,8 +145,8 @@ typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        ln -f typetest$(EXEEXT) typetest.app/Contents/MacOS/typetest
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc typetest.app/Contents/Resources/typetest.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns typetest.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc typetest.app/Contents/Resources/typetest.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns typetest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@typetest_bundle: typetest.app/Contents/PkgInfo