From b8e112e3bac3e7260ad6be6da314f7d3fe12886d Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 2 Mar 2007 00:56:59 +0000
Subject: [PATCH] link with proper libs for NATIVE_NET case

---
 direct/src/distributed/Sources.pp | 2 +-
 dtool/Config.pp                   | 1 +
 dtool/pptempl/Global.pp           | 6 ++++++
 panda/src/nativenet/Sources.pp    | 3 +--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/direct/src/distributed/Sources.pp b/direct/src/distributed/Sources.pp
index a4f1056e5b..c518c7ed1d 100644
--- a/direct/src/distributed/Sources.pp
+++ b/direct/src/distributed/Sources.pp
@@ -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 \
diff --git a/dtool/Config.pp b/dtool/Config.pp
index 70aa5ead30..12a4688b6d 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -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
diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index 132e3e016a..866db5a965 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -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]]
diff --git a/panda/src/nativenet/Sources.pp b/panda/src/nativenet/Sources.pp
index 9304c8d592..5f24bf7faf 100644
--- a/panda/src/nativenet/Sources.pp
+++ b/panda/src/nativenet/Sources.pp
@@ -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