Applied patch [ 845171 ] Use transparancy mask in wxBitmapShape

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

diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index e1054bcefc4192abebe991f17d9dcf14d2896109..4cdb59e2c7d3349d022631c9c636b9f720679da2 100644 (file)
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -34,11 +34,13 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+DESTDIR = 

 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib

-STATBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \

-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)

 STATBAR_OBJECTS =  \
 STATBAR_OBJECTS =  \

+       $(__statbar_os2_lib_res) \

        statbar_statbar.o \
        $(__statbar___win32rc)
 WX_VERSION = 2.5.1
        statbar_statbar.o \
        $(__statbar___win32rc)
 WX_VERSION = 2.5.1


@@ -98,6 +100,8 @@ COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd = $(NM) statbar$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__statbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_statbar_rc.o
 @COND_PLATFORM_MACOSX_1@__statbar_bundle___depname = statbar_bundle
 @COND_PLATFORM_OS2_1@__statbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___statbar___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_statbar_rc.o
 @COND_PLATFORM_MACOSX_1@__statbar_bundle___depname = statbar_bundle

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

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


@@ -141,8 +145,8 @@ statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f statbar$(EXEEXT) statbar.app/Contents/MacOS/statbar
        
        
        ln -f statbar$(EXEEXT) statbar.app/Contents/MacOS/statbar
        
        

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

 
 @COND_PLATFORM_MACOSX_1@statbar_bundle: statbar.app/Contents/PkgInfo
 
 
 @COND_PLATFORM_MACOSX_1@statbar_bundle: statbar.app/Contents/PkgInfo