Code now builds in Win32 and tests pass. Example code seems to fail though, still tracking that down.
This commit is contained in:
@@ -81,6 +81,7 @@ expat = expatenv.Library('expat', path(join('expat', 'lib'), ExpatSources))
|
|||||||
Default(expat)
|
Default(expat)
|
||||||
|
|
||||||
stropheenv = env.Copy()
|
stropheenv = env.Copy()
|
||||||
|
stropheenv.Append(CCFLAGS=" -DXML_STATIC")
|
||||||
stropheenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
|
stropheenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
|
||||||
|
|
||||||
strophe = stropheenv.Library('strophe', path("src", Sources))
|
strophe = stropheenv.Library('strophe', path("src", Sources))
|
||||||
@@ -128,6 +129,8 @@ def testcase_runner(target, source, env):
|
|||||||
testenv = env.Copy()
|
testenv = env.Copy()
|
||||||
testenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
|
testenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
|
||||||
testenv.Append(LIBS=['strophe', 'expat'])
|
testenv.Append(LIBS=['strophe', 'expat'])
|
||||||
|
if testenv["PLATFORM"] == "win32":
|
||||||
|
testenv.Append(LIBS=["winmm", "ws2_32"])
|
||||||
testenv.Append(LIBPATH=['.'])
|
testenv.Append(LIBPATH=['.'])
|
||||||
|
|
||||||
import SCons.Node
|
import SCons.Node
|
||||||
|
|||||||
@@ -14,7 +14,10 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
#include <sys/select.h>
|
#include <sys/select.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "sock.h"
|
#include "sock.h"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user