another Unicode compilation fix for !wxUSE_ENHMETAFILE

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

diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index d95eff1d63e7bfbe334e54934970311717a392d1..88b7e7b11fc106acfa455ace9d5bfe9b9d3a216b 100644 (file)
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -34,13 +34,15 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-ARTTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 ARTTEST_OBJECTS =  \
+       $(__arttest_os2_lib_res) \
        arttest_arttest.o \
        arttest_artbrows.o \
        $(__arttest___win32rc)
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
 WX_VERSION = 2.5.1
 
@@ -99,6 +101,8 @@ COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd = $(NM) arttest$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__arttest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___arttest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__arttest___win32rc = arttest_arttest_rc.o
 @COND_PLATFORM_MACOSX_1@__arttest_bundle___depname = arttest_bundle
+@COND_PLATFORM_OS2_1@__arttest_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -129,8 +133,8 @@ arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f arttest$(EXEEXT) arttest.app/Contents/MacOS/arttest
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc arttest.app/Contents/Resources/arttest.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns arttest.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc arttest.app/Contents/Resources/arttest.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns arttest.app/Contents/Resources/wxmac.icns
 
 arttest_artbrows.o: $(srcdir)/artbrows.cpp
        $(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $<