compilation fix for tooltip patch code applied by Julian and w32api

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

diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index 14cb79e634de710722d45de4ce8346eddb154e81..6a7b087a8c365f2d6fefde9ed858e0ba22781402 100644 (file)
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -36,10 +36,10 @@ top_srcdir = @top_srcdir@
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-TASKBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 TASKBAR_OBJECTS =  \
+       $(__taskbar_os2_lib_res) \
        taskbar_tbtest.o \
        $(__taskbar___win32rc)
 WX_VERSION = 2.5.1
@@ -76,8 +76,8 @@ WX_VERSION = 2.5.1
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 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 taskbar$(EXEEXT) Carbon.r \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../samples -o taskbar$(EXEEXT) Carbon.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_ADV_p = \
@@ -102,6 +102,8 @@ COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd = $(NM) taskbar$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__taskbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_tbtest_rc.o
 @COND_PLATFORM_MACOSX_1@__taskbar_bundle___depname = taskbar_bundle
+@COND_PLATFORM_OS2_1@__taskbar_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -145,8 +147,8 @@ taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc taskbar.app/Contents/Resources/taskbar.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc taskbar.app/Contents/Resources/taskbar.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@taskbar_bundle: taskbar.app/Contents/PkgInfo
 
@@ -154,7 +156,7 @@ taskbar_tbtest.o: $(srcdir)/tbtest.cpp
        $(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $<
 
 taskbar_tbtest_rc.o: $(srcdir)/tbtest.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 $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 uninstall: