Swiftdiff options
Diffstat (limited to 'Swiften')
| -rw-r--r-- | Swiften/Application/SConscript | 2 | ||||
| -rw-r--r-- | Swiften/EventLoop/SConscript | 2 | ||||
| -rw-r--r-- | Swiften/Examples/SConscript | 7 | ||||
| -rw-r--r-- | Swiften/History/SConscript | 3 | ||||
| -rw-r--r-- | Swiften/Network/SConscript | 16 | ||||
| -rw-r--r-- | Swiften/QA/ClientTest/SConscript | 2 |
6 files changed, 21 insertions, 11 deletions
diff --git a/Swiften/Application/SConscript b/Swiften/Application/SConscript index 7696bd7..78b3a34 100644 --- a/Swiften/Application/SConscript +++ b/Swiften/Application/SConscript @@ -5,7 +5,7 @@ sources = [ "ApplicationMessageDisplay.cpp", ] -if swiften_env["PLATFORM"] == "darwin" : +if swiften_env["PLATFORM"] == "darwin" and swiften_env["target"] == "native" : sources += [ "MacOSX/MacOSXApplication.cpp", "MacOSX/MacOSXApplicationMessageDisplay.mm", diff --git a/Swiften/EventLoop/SConscript b/Swiften/EventLoop/SConscript index 93341a3..5d1c3cb 100644 --- a/Swiften/EventLoop/SConscript +++ b/Swiften/EventLoop/SConscript @@ -7,7 +7,7 @@ sources = [ "SimpleEventLoop.cpp", ] -if swiften_env["PLATFORM"] == "darwin" : +if swiften_env["PLATFORM"] == "darwin" and swiften_env["target"] == "native": sources += [ "Cocoa/CocoaEventLoop.mm", "Cocoa/CocoaEvent.mm" diff --git a/Swiften/Examples/SConscript b/Swiften/Examples/SConscript index 4ab80c2..a4d5998 100644 --- a/Swiften/Examples/SConscript +++ b/Swiften/Examples/SConscript @@ -1,3 +1,8 @@ -SConscript(dirs = [ +Import("swiften_env") + +myenv = swiften_env.Clone() + +if myenv["target"] == "native": + SConscript(dirs = [ "SendMessage" ]) diff --git a/Swiften/History/SConscript b/Swiften/History/SConscript index 328ce1c..bc80780 100644 --- a/Swiften/History/SConscript +++ b/Swiften/History/SConscript @@ -1,7 +1,8 @@ Import("swiften_env") myenv = swiften_env.Clone() -myenv.MergeFlags(swiften_env["SQLITE_FLAGS"]) +if myenv["target"] == "native": + myenv.MergeFlags(swiften_env["SQLITE_FLAGS"]) objects = myenv.StaticObject([ "HistoryManager.cpp", diff --git a/Swiften/Network/SConscript b/Swiften/Network/SConscript index 767eee2..937ab0c 100644 --- a/Swiften/Network/SConscript +++ b/Swiften/Network/SConscript @@ -2,9 +2,10 @@ Import("swiften_env") myenv = swiften_env.Clone() myenv.MergeFlags(myenv["LIBIDN_FLAGS"]) -myenv.MergeFlags(myenv["CARES_FLAGS"]) +if myenv["target"] == "native": + myenv.MergeFlags(myenv["CARES_FLAGS"]) -objects = myenv.StaticObject([ +sourceList = [ "BoostConnection.cpp", "BoostConnectionFactory.cpp", "BoostConnectionServer.cpp", @@ -12,7 +13,7 @@ objects = myenv.StaticObject([ "BoostIOServiceThread.cpp", "ConnectionFactory.cpp", "ConnectionServer.cpp", - "Connector.cpp", + "Connector.cpp", "TimerFactory.cpp", "DummyTimerFactory.cpp", "BoostTimerFactory.cpp", @@ -21,10 +22,13 @@ objects = myenv.StaticObject([ "DomainNameServiceQuery.cpp", "PlatformDomainNameResolver.cpp", "PlatformDomainNameServiceQuery.cpp", - "CAresDomainNameResolver.cpp", "StaticDomainNameResolver.cpp", "HostAddress.cpp", "Timer.cpp", - "BoostTimer.cpp", - ]) + "BoostTimer.cpp"] +if myenv["target"] == "native": + sourceList.append("CAresDomainNameResolver.cpp") + + +objects = myenv.StaticObject(sourceList) swiften_env.Append(SWIFTEN_OBJECTS = [objects]) diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript index f22e89d..bc9cf95 100644 --- a/Swiften/QA/ClientTest/SConscript +++ b/Swiften/QA/ClientTest/SConscript @@ -8,7 +8,7 @@ if env["TEST"] : myenv.MergeFlags(myenv["CPPUNIT_FLAGS"]) myenv.MergeFlags(myenv["LIBIDN_FLAGS"]) myenv.MergeFlags(myenv["BOOST_FLAGS"]) - myenv.MergeFlags(myenv["SQLITE_FLAGS"]) + myenv.MergeFlags(myenv.get("SQLITE_FLAGS", "")) myenv.MergeFlags(myenv["ZLIB_FLAGS"]) myenv.MergeFlags(myenv["OPENSSL_FLAGS"]) myenv.MergeFlags(myenv.get("LIBXML_FLAGS", "")) |