Applied patch [ 845171 ] Use transparancy mask in wxBitmapShape

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

diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index 5ccf8ff8688f87d6373d61cf8eb6a43f3b977362..8e636ee6087b4772f24d32e317ab6b17ab614898 100644 (file)
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -33,14 +34,16 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-KEYBOARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DESTDIR = 
+KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 KEYBOARD_OBJECTS =  \
+       $(__keyboard_os2_lib_res) \
        keyboard_keyboard.o \
        $(__keyboard___win32rc)
 LIBDIRNAME = $(top_builddir)lib
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -76,7 +79,7 @@ WX_VERSION = 2.5.0
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o keyboard$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -92,8 +95,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__keyboard___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C keyboard$(EXEEXT)
+COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd = $(NM) keyboard$(EXEEXT) | if \
+       grep -q pmwin.763 ; then emxbind -ep keyboard$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__keyboard___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___keyboard___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__keyboard___win32rc = keyboard_keyboard_rc.o
 @COND_PLATFORM_MACOSX_1@__keyboard_bundle___depname = keyboard_bundle
+@COND_PLATFORM_OS2_1@__keyboard_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -113,12 +121,13 @@ install: all
 install-strip: install
 
 keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
-       $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__keyboard___mac_rezcmd)
        $(__keyboard___mac_setfilecmd)
+       $(__keyboard___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p keyboard.app/Contents
        mkdir -p keyboard.app/Contents/MacOS
        mkdir -p keyboard.app/Contents/Resources
@@ -136,8 +145,8 @@ keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
        ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc keyboard.app/Contents/Resources/keyboard.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc keyboard.app/Contents/Resources/keyboard.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@keyboard_bundle: keyboard.app/Contents/PkgInfo
 
@@ -145,7 +154,7 @@ keyboard_keyboard.o: $(srcdir)/keyboard.cpp
        $(CXXC) -c -o $@ $(KEYBOARD_CXXFLAGS) $<
 
 keyboard_keyboard_rc.o: $(srcdir)/keyboard.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 uninstall: