Swiftdiff options
| author | dknn <yoann.blein@free.fr> | 2012-08-17 14:32:42 (GMT) |
|---|---|---|
| committer | dknn <yoann.blein@free.fr> | 2012-09-22 09:32:38 (GMT) |
| commit | 65f6d936741cd4487de1b469a5db39fb4fdccf07 (patch) | |
| tree | fc50b5813491c8df89779866b9cda839f7bcdba5 | |
| parent | 231102424d9768cc17e222cd779c6814f01433b7 (diff) | |
| download | swift-contrib-65f6d936741cd4487de1b469a5db39fb4fdccf07.zip swift-contrib-65f6d936741cd4487de1b469a5db39fb4fdccf07.tar.bz2 | |
Fix JRTPLIB building
| -rw-r--r-- | 3rdParty/JRTPLIB/SConscript | 67 |
1 files changed, 24 insertions, 43 deletions
diff --git a/3rdParty/JRTPLIB/SConscript b/3rdParty/JRTPLIB/SConscript index e3dafd1..8504e11 100644 --- a/3rdParty/JRTPLIB/SConscript +++ b/3rdParty/JRTPLIB/SConscript @@ -3,30 +3,6 @@ Import(["env", "conf_env"]) if env.get("JRTPLIB_BUNDLED", False) : ################################################################################ -# Common -################################################################################ - - cppdefines = ["RTP_SUPPORT_RTCPUNKNOWN", - ("JRTPLIB_EXPORT", ""), - ("JRTPLIB_IMPORTEXPORT", "JRTPLIB_EXPORT"), - "RTP_SOCKLENTYPE_UINT", - "RTP_SUPPORT_IPV4MULTICAST", - "RTP_SUPPORT_SDESPRIV", - "RTP_SUPPORT_PROBATION", - "RTP_SUPPORT_GETLOGINR", - "RTP_SUPPORT_IPV6", - "RTP_SUPPORT_IPV6MULTICAST", - "RTP_SUPPORT_IFADDRS", - "RTP_SUPPORT_SENDAPP", - ] - - if env["PLATFORM"] != "win32" : - cppdefines += ["RTPCONFIG_UNIX_H", ] - if env["PLATFORM"] != "win32" : - cppflags = [("-include", "sys/types.h"), ("-include", "stdint.h")] - - -################################################################################ # Module flags ################################################################################ @@ -36,13 +12,7 @@ if env.get("JRTPLIB_BUNDLED", False) : "LIBPATH": [Dir(".")], "LIBS": ["Swiften_JRTPLIB"], "INTERNAL_CPPDEFINES": ["STATICLIB"], - "CPPDEFINES": cppdefines, - "CPPFLAGS": cppflags, } - #if env["PLATFORM"] == "win32" : - # env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")] - # if env["MSVC_VERSION"][:3] == "9.0" : - # env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32/VC2008")] ################################################################################ # Build @@ -54,16 +24,30 @@ if env.get("JRTPLIB_BUNDLED", False) : # Remove warn flags myenv.Replace(CXXFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]]) - #myenv.Append(CCFLAGS = ["-DNDEBUG", "-DSTATICLIB"]) - - #if myenv["PLATFORM"] != "win32": - # myenv.Append(CCFLAGS = ["-DMINIUPNPC_SET_SOCKET_TIMEOUT"]) - - #if myenv["PLATFORM"] == "darwin": - # myenv.Append(CCFLAGS = ["-DMACOSX", "-D_DARWIN_C_SOURCE"]) - - #if myenv["PLATFORM"] == "win32": - # myenv.Append(CCFLAGS = ["-DWIN32"]) + myenv.WriteVal("src/rtpconfig.h", myenv.Value( +""" +#pragma once +#define JRTPLIB_IMPORT +#define JRTPLIB_EXPORT +#define JRTPLIB_IMPORTEXPORT JRTPLIB_EXPORT +#define RTP_SOCKLENTYPE_UINT +#define RTP_SUPPORT_IPV4MULTICAST +#define RTP_SUPPORT_SDESPRIV +#define RTP_SUPPORT_PROBATION +#define RTP_SUPPORT_GETLOGINR +#define RTP_SUPPORT_IPV6 +#define RTP_SUPPORT_IPV6MULTICAST +#define RTP_SUPPORT_IFADDRS +#define RTP_SUPPORT_SENDAPP +#define RTP_SUPPORT_RTCPUNKNOWN +""")) + + myenv.WriteVal("src/rtptypes.h", myenv.Value( +""" +#pragma once +#include <stdint.h> +#include <sys/types.h> +""")) src_files = [ "src/rtpsession.cpp", @@ -110,7 +94,4 @@ if env.get("JRTPLIB_BUNDLED", False) : "src/rtpudpv6transmitter.cpp", ] - #if myenv["PLATFORM"] == "win32": - # src_files += ["src/libnatpmp/wingettimeofday.c"] - myenv.StaticLibrary("Swiften_JRTPLIB", src_files) |