Don't crash when creating wxStaticBox in wxGTK.

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

diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index 99c9f4b9270326fe91a25da506a212379717eb3f..292275dc6d682aa059f58b67cebb77213dd31c5d 100644 (file)
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).4
+WX_VERSION = $(WX_RELEASE).5
 LIBDIRNAME = $(wx_top_builddir)/lib
 NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -114,6 +114,9 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
+@COND_MONOLITHIC_1_USE_STC_1@  = \
+@COND_MONOLITHIC_1_USE_STC_1@  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
 @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -151,7 +154,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_PLATFORM_MSDOS_0@nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
-@COND_PLATFORM_MSDOS_0@        $(CXX) -o $@ $(NETTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_PLATFORM_MSDOS_0@        $(CXX) -o $@ $(NETTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 @COND_PLATFORM_MSDOS_0@        
 @COND_PLATFORM_MSDOS_0@        $(__nettest___mac_setfilecmd)
 @COND_PLATFORM_MSDOS_0@        $(__nettest___os2_emxbindcmd)
@@ -168,7 +171,7 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      $(top_srcdir)/src/osx/carbon/Info.plist.in >nettest.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      
-@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      echo -n "APPL????" >nettest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      /bin/echo "APPL????" >nettest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest