Changeset 639

Timestamp:

03/15/07 00:32:37 (17 months ago)

Author:

hyriand

Message:

Build system updates

Location:

branches/newnet/museekd

Files:

• SConstruct (modified) (3 diffs)
• museekd/SConscript (modified) (2 diffs)

branches/newnet/museekd/SConstruct

@@ +1 @@
+import sys
+
 env = Environment()
 
@@ -10 +12 @@
 conf = Configure(env, custom_tests = { 'CheckLargeFileSupport': CheckLargeFileSupport })
 flags = conf.CheckLargeFileSupport()
+if sys.platform == 'win32':
+  conf.CheckLib('wsock32')
 env = conf.Finish()
 
@@ -23 +27 @@
   NewNet/nntcpserversocket.cpp
   NewNet/nnratelimiter.cpp
-  NewNet/nnunixclientsocket.cpp
-  NewNet/nnunixserversocket.cpp
 """)
+if sys.platform != 'win32':
+  newnet_sources += Split("""
+    NewNet/nnunixclientsocket.cpp
+    NewNet/nnunixserversocket.cpp
+  """)
 newnet_lib = env_newnet.Library("NewNet/newnet", newnet_sources)
 

branches/newnet/museekd/museekd/SConscript

@@ -9 +9 @@
 if os.path.exists('/usr/local/lib'):
   env_museekd.Append(LIBPATH = ['/usr/local/lib'])
-
-env_museekd.Append(LIBS = [newnet_lib, mucipher_lib])
-env_museekd.Append(CPPPATH = ['#'])
 
 conf = Configure(env_museekd, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
@@ -68 +65 @@
 if libxml2_pkgconfig:
   env_museekd.ParseConfig('pkg-config --cflags --libs libxml-2.0')
+env_museekd.Prepend(LIBS = [newnet_lib, mucipher_lib])
+env_museekd.Append(CPPPATH = ['#'])
 
 museekd_sources = Split("""