Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-13 13:35:53 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-04-06 20:22:02 (GMT) |
| commit | 9eff25182d1bea576d1910200909384ce79d90fe (patch) | |
| tree | f5dadbce5fa2c37c34fcc6bb32550e6930abce14 /Swiften/IDN/SConscript | |
| parent | e9f2f7675b11ce36b3f66250156b78fae524a351 (diff) | |
| download | swift-9eff25182d1bea576d1910200909384ce79d90fe.zip swift-9eff25182d1bea576d1910200909384ce79d90fe.tar.bz2 | |
Make IDN implementation abstract.
Change-Id: I4c64f954ddeca7147d729b8be07237baa15c1795
Diffstat (limited to 'Swiften/IDN/SConscript')
| -rw-r--r-- | Swiften/IDN/SConscript | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Swiften/IDN/SConscript b/Swiften/IDN/SConscript index 1433318..1011563 100644 --- a/Swiften/IDN/SConscript +++ b/Swiften/IDN/SConscript @@ -1,20 +1,23 @@ Import("swiften_env", "env") + +objects = swiften_env.SwiftenObject(["IDNConverter.cpp"]) + myenv = swiften_env.Clone() if myenv.get("HAVE_ICU") : myenv.MergeFlags(swiften_env["ICU_FLAGS"]) myenv.Append(CPPDEFINES = ["HAVE_ICU"]) -elif myenv.get("HAVE_LIBIDN") : + objects += myenv.SwiftenObject(["ICUConverter.cpp"]) +if myenv.get("HAVE_LIBIDN") : myenv.MergeFlags(swiften_env["LIBIDN_FLAGS"]) myenv.Append(CPPDEFINES = ["HAVE_LIBIDN"]) + objects += myenv.SwiftenObject(["LibIDNConverter.cpp"]) +objects += myenv.SwiftenObject(["PlatformIDNConverter.cpp"]) -objects = myenv.SwiftenObject([ - "StringPrep.cpp", - "IDNA.cpp", - ]) swiften_env.Append(SWIFTEN_OBJECTS = [objects]) -env.Append(UNITTEST_SOURCES = [ - File("UnitTest/StringPrepTest.cpp"), - File("UnitTest/IDNATest.cpp"), - ]) +#env.Append(UNITTEST_OBJECTS = myenv.SwiftenObject([ +# File("UnitTest/IDNATest.cpp"), +#]) + + |