More minor win32 build fixes. The only linking problem is now expat.lib.
This commit is contained in:
@@ -80,7 +80,7 @@ expatenv.Append(CCFLAGS=" -DHAVE_UNISTD")
|
|||||||
expat = expatenv.Library('expat', path(join('expat', 'lib'), ExpatSources))
|
expat = expatenv.Library('expat', path(join('expat', 'lib'), ExpatSources))
|
||||||
Default(expat)
|
Default(expat)
|
||||||
|
|
||||||
stropheenv = env.Copy()
|
stropheenv = env.Copy()
|
||||||
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))
|
||||||
@@ -89,13 +89,15 @@ Default(strophe)
|
|||||||
exenv = stropheenv.Copy()
|
exenv = stropheenv.Copy()
|
||||||
exenv.Append(LIBS=["strophe", "expat"])
|
exenv.Append(LIBS=["strophe", "expat"])
|
||||||
exenv.Append(LIBPATH=["."])
|
exenv.Append(LIBPATH=["."])
|
||||||
|
if exenv["PLATFORM"] == "win32":
|
||||||
|
exenv.Append(LIBS=["ws2_32", "winmm"])
|
||||||
for e in path("examples", Examples):
|
for e in path("examples", Examples):
|
||||||
example = exenv.Program(e)
|
example = exenv.Program(e)
|
||||||
Default(example)
|
Default(example)
|
||||||
|
|
||||||
# generate a MSVC project for convenience
|
# generate a MSVC project for convenience
|
||||||
# TODO: this doesn't seem to be implemented?
|
# TODO: this doesn't seem to be implemented?
|
||||||
#env.MSVSProject(target = 'strophe' + env['MSVSPROJECTSUFFIX'],
|
#env.MSVSProject(target = 'strophe' + env['MSVSPROJECTSUFFIX'],
|
||||||
# srcs = path("src", Sources), incs = path("src", Headers),
|
# srcs = path("src", Sources), incs = path("src", Headers),
|
||||||
# variant = 'Release', buildtarget = strophe)
|
# variant = 'Release', buildtarget = strophe)
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,10 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "sasl.h"
|
#include "sasl.h"
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#define strcasecmp stricmp
|
||||||
|
#endif
|
||||||
|
|
||||||
#define FEATURES_TIMEOUT 2000 /* 2 seconds */
|
#define FEATURES_TIMEOUT 2000 /* 2 seconds */
|
||||||
#define BIND_TIMEOUT 2000 /* 2 seconds */
|
#define BIND_TIMEOUT 2000 /* 2 seconds */
|
||||||
#define LEGACY_TIMEOUT 2000 /* 2 seconds */
|
#define LEGACY_TIMEOUT 2000 /* 2 seconds */
|
||||||
|
|||||||
@@ -21,6 +21,10 @@
|
|||||||
#include "strophe.h"
|
#include "strophe.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#define snprintf _snprintf
|
||||||
|
#endif
|
||||||
|
|
||||||
static void _log_open_tag(xmpp_conn_t * const conn,
|
static void _log_open_tag(xmpp_conn_t * const conn,
|
||||||
const XML_Char **attr)
|
const XML_Char **attr)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
#include "hash.h"
|
#include "hash.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
#define snprintf _snprintf
|
||||||
#define inline __inline
|
#define inline __inline
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user