From 0d311771bbd960c503c14b860dbc5fdd51cedaa2 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Wed, 15 Jun 2005 05:17:07 +0000 Subject: [PATCH] Code now builds in Win32 and tests pass. Example code seems to fail though, still tracking that down. --- SConstruct | 3 +++ tests/test_sock.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/SConstruct b/SConstruct index 72d0ef4..0c9d48b 100644 --- a/SConstruct +++ b/SConstruct @@ -81,6 +81,7 @@ expat = expatenv.Library('expat', path(join('expat', 'lib'), ExpatSources)) Default(expat) stropheenv = env.Copy() +stropheenv.Append(CCFLAGS=" -DXML_STATIC") stropheenv.Append(CPPPATH=['.', 'src', join('expat','lib')]) strophe = stropheenv.Library('strophe', path("src", Sources)) @@ -128,6 +129,8 @@ def testcase_runner(target, source, env): testenv = env.Copy() testenv.Append(CPPPATH=['.', 'src', join('expat','lib')]) testenv.Append(LIBS=['strophe', 'expat']) +if testenv["PLATFORM"] == "win32": + testenv.Append(LIBS=["winmm", "ws2_32"]) testenv.Append(LIBPATH=['.']) import SCons.Node diff --git a/tests/test_sock.c b/tests/test_sock.c index 648196b..7d80a55 100644 --- a/tests/test_sock.c +++ b/tests/test_sock.c @@ -14,7 +14,10 @@ #include #include + +#ifndef _WIN32 #include +#endif #include "sock.h"