added default value (0) for flags argument of AdjustForParentClientOrigin()

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

diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index 7b46ce565dc4c1bfdf652e5b11ec15a54f13bf80..445c6f6a4dab210260d2177bd3ff3db94c4d1e59 100644 (file)
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -35,10 +35,11 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 DESTDIR = 
-JOYTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 JOYTEST_OBJECTS =  \
+       $(__joytest_os2_lib_res) \
        joytest_joytest.o \
        $(__joytest___win32rc)
 LIBDIRNAME = $(top_builddir)lib
@@ -102,6 +103,8 @@ COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd = $(NM) joytest$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__joytest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__joytest___win32rc = joytest_joytest_rc.o
 @COND_PLATFORM_MACOSX_1@__joytest_bundle___depname = joytest_bundle
+@COND_PLATFORM_OS2_1@__joytest_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -145,8 +148,8 @@ joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc joytest.app/Contents/Resources/joytest.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns joytest.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc joytest.app/Contents/Resources/joytest.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns joytest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@joytest_bundle: joytest.app/Contents/PkgInfo