another Unicode compilation fix for !wxUSE_ENHMETAFILE

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

diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in
index a9a3d1fcc900bada21c93408d7c65c8a1f57a13f..90b0239b9cb94f5947cdfe0c171446acd59ada70 100644 (file)
--- a/samples/tab/Makefile.in
+++ b/samples/tab/Makefile.in
@@ -34,11 +34,12 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-TAB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+TAB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 TAB_OBJECTS =  \
+       $(__tab_os2_lib_res) \
        tab_tab.o \
        $(__tab___win32rc)
 WX_VERSION = 2.5.1
@@ -97,6 +98,8 @@ COND_PLATFORM_OS2_1___tab___os2_emxbindcmd = $(NM) tab$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__tab___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___tab___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__tab___win32rc = tab_tab_rc.o
 @COND_PLATFORM_MACOSX_1@__tab_bundle___depname = tab_bundle
+@COND_PLATFORM_OS2_1@__tab_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -140,8 +143,8 @@ tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        ln -f tab$(EXEEXT) tab.app/Contents/MacOS/tab
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc tab.app/Contents/Resources/tab.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns tab.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc tab.app/Contents/Resources/tab.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns tab.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@tab_bundle: tab.app/Contents/PkgInfo