link against the net library, too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-12-21 10:27:13 +00:00
parent 8d4dc98f75
commit 651bb0c9e5
8 changed files with 68 additions and 37 deletions

View File

@@ -70,6 +70,8 @@ LIBDIRNAME = $(top_builddir)lib
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@COND_MONOLITHIC_0@__WXLIB_NET_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_PLATFORM_MAC_1@__console___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL console$(EXEEXT)
@@ -84,7 +86,7 @@ clean:
rm -f console$(EXEEXT)
console$(EXEEXT): $(CONSOLE_OBJECTS)
$(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS)
$(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS)
$(__console___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK)