summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/IDN/SConscript')
-rw-r--r--Swiften/IDN/SConscript24
1 files changed, 15 insertions, 9 deletions
diff --git a/Swiften/IDN/SConscript b/Swiften/IDN/SConscript
index 1433318..9d3b8f9 100644
--- a/Swiften/IDN/SConscript
+++ b/Swiften/IDN/SConscript
@@ -1,20 +1,26 @@
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"),
- ])
+if env["TEST"] :
+ test_env = myenv.Clone()
+ test_env.UseFlags(swiften_env["CPPUNIT_FLAGS"])
+ env.Append(UNITTEST_OBJECTS = test_env.SwiftenObject([
+ File("UnitTest/IDNConverterTest.cpp"),
+ ]))
+
+