link with proper libs for NATIVE_NET case

This commit is contained in:
David Rose 2007-03-02 00:56:59 +00:00
parent 7d98e016ba
commit b8e112e3ba
4 changed files with 9 additions and 3 deletions

View File

@ -2,7 +2,7 @@
#begin lib_target
#define BUILD_TARGET $[HAVE_PYTHON]
#define USE_PACKAGES openssl nspr
#define USE_PACKAGES openssl nspr native_net
#define TARGET distributed
#define LOCAL_LIBS \

View File

@ -413,6 +413,7 @@
// Define this true to build a native network implementation,
// which does not require NSPR.
#define WANT_NATIVE_NET 1
#define NATIVE_NET_LIBS $[if $[WINDOWS_PLATFORM],Ws2_32.lib]
// Is a third-party STL library installed, and where? This is only
// necessary if the default include and link lines that come with the

View File

@ -317,6 +317,12 @@
#define net_libs $[NET_LIBS]
#endif
#if $[WANT_NATIVE_NET]
#define native_net_ipath $[wildcard $[NATIVE_NET_IPATH]]
#define native_net_lpath $[wildcard $[NATIVE_NET_LPATH]]
#define native_net_libs $[NATIVE_NET_LIBS]
#endif
#if $[HAVE_RAD_MSS]
#define rad_mss_ipath $[wildcard $[RAD_MSS_IPATH]]
#define rad_mss_lpath $[wildcard $[RAD_MSS_LPATH]]

View File

@ -1,5 +1,3 @@
#define LOCAL_LIBS express pandabase
#define OTHER_LIBS \
@ -7,6 +5,7 @@
dtoolutil:c dtoolbase:c prc:c dtool:m
#define BUILD_DIRECTORY $[WANT_NATIVE_NET]
#define USE_PACKAGES native_net
#begin lib_target
#define TARGET nativenet