2 files changed, 14 insertions, 2 deletions
diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript
index 92d6836..3711ad8 100644
--- a/3rdParty/LibIDN/SConscript
+++ b/3rdParty/LibIDN/SConscript
@@ -1,5 +1,7 @@
 Import(["env", "conf_env"])
 
+import os
+
 if env.get("LIBIDN_BUNDLED", False) :
 
 ################################################################################
@@ -9,8 +11,12 @@ if env.get("LIBIDN_BUNDLED", False) :
 	if env["SCONS_STAGE"] == "flags" :
 		env["LIBIDN_FLAGS"] = {
 				"CPPDEFINES": ["IDNA_STATIC"],
-				"CPPPATH": [Dir("src")],
 			}
+		if os.path.basename(env["CC"]) in ("clang", "gcc") :
+			env["LIBIDN_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibIDN/src"]})
+		else :
+			env["LIBIDN_FLAGS"].update({"CPPPATH": [Dir("src")]})
+
 		if env["PLATFORM"] == "win32" :
 			env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")]
 			if env["MSVC_VERSION"][:3] == "9.0" :
diff --git a/3rdParty/LibMiniUPnPc/SConscript b/3rdParty/LibMiniUPnPc/SConscript
index 0ed6da4..ce2fe48 100644
--- a/3rdParty/LibMiniUPnPc/SConscript
+++ b/3rdParty/LibMiniUPnPc/SConscript
@@ -1,5 +1,7 @@
 Import(["env", "conf_env"])
 
+import os
+
 if env.get("LIBMINIUPNPC_BUNDLED", False) :
 
 ################################################################################
@@ -9,10 +11,14 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) :
 	if env["SCONS_STAGE"] == "flags" :
 		env["HAVE_LIBMINIUPNPC"] = True
 		env["LIBMINIUPNPC_FLAGS"] = {
-				"CPPPATH": [Dir("src/miniupnpc")],
 				"LIBPATH": [Dir(".")],
 				"INTERNAL_CPPDEFINES": ["STATICLIB"],
 			}
+		if os.path.basename(env["CC"]) in ("clang", "gcc") :
+			env["LIBMINIUPNPC_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibMiniUPnPc/src/miniupnpc"]})
+		else :
+			env["LIBMINIUPNPC_FLAGS"].update({"CPPPATH": [Dir("src/miniupnpc")]})
+
 		#if env["PLATFORM"] == "win32" :
 		#	env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")]
 		#	if env["MSVC_VERSION"][:3] == "9.0" :