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

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

diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index aba096c4e17f0d4cfc163ae37ab58d88248201f6..32812423b923abcd8b9b10ddf498e2e9d81e205d 100644 (file)
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -36,10 +36,11 @@ top_srcdir = @top_srcdir@
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-NETTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 NETTEST_OBJECTS =  \
+       $(__nettest_os2_lib_res) \
        nettest_nettest.o \
        $(__nettest___win32rc)
 WX_VERSION = 2.5.1
@@ -99,6 +100,8 @@ COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__nettest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_nettest_rc.o
 @COND_PLATFORM_MACOSX_1@__nettest_bundle___depname = nettest_bundle
+@COND_PLATFORM_OS2_1@__nettest_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -142,8 +145,8 @@ nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc nettest.app/Contents/Resources/nettest.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns nettest.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc nettest.app/Contents/Resources/nettest.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns nettest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@nettest_bundle: nettest.app/Contents/PkgInfo