allow poco libraries to be auto imported on windows in most cases

samtupy · Nov 9, 2024 · a77edac · a77edac
1 parent e57e597
commit a77edac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/plugin/integrated/curl/_SConscript b/plugin/integrated/curl/_SConscript
@@ -8,7 +8,7 @@ winlibs = ""
 if env["PLATFORM"] == "win32":
 	winlibs = "kernel32 user32 crypt32 advapi32 iphlpapi netapi32 uuid wldap32 ws2_32 normaliz"
 if ARGUMENTS.get("no_shared_plugins", "0") == "0":
-	env.SharedLibrary("#release/lib/nvgt_curl", ["internet.cpp", scriptarray], LIBS = Split(winlibs) + ["libcurl", "PocoFoundationMT" if env["PLATFORM"] == "win32" else "PocoFoundation"], CPPDEFINES = ["CURL_STATICLIB"])
+	env.SharedLibrary("#release/lib/nvgt_curl", ["internet.cpp", scriptarray], LIBS = Split(winlibs) + ["libcurl"] + (["PocoFoundation"] if env["PLATFORM"] != "win32" else ["PocoFoundationMT" if not "windev_debug" in env else "PocoFoundationMTD"]), CPPDEFINES = ["CURL_STATICLIB"])
 static = env.Object("internet_static", "internet.cpp", CPPDEFINES = [("NVGT_PLUGIN_STATIC", "nvgt_curl"), "CURL_STATICLIB"])
 static = env.StaticLibrary("#build/lib/nvgt_curl", [static], LIBS = ["libcurl"])
 static = [static, "libcurl"]

diff --git a/plugin/integrated/sqlite/_SConscript b/plugin/integrated/sqlite/_SConscript
@@ -12,8 +12,7 @@ else:
 	avxenv.Append(CCFLAGS=["-mavx", "-maes"])
 sqlite_addons = avxenv.SharedObject(["#extra/plugin/dep/sqlite3/dbdump.c", "#extra/plugin/dep/sqlite3/eval.c", "#extra/plugin/dep/sqlite3/monocypher.c", "#extra/plugin/dep/sqlite3/monocypher-ed25519.c", "#extra/plugin/dep/sqlite3/xchacha_cipher.c", "#extra/plugin/dep/sqlite3/spellfix.c", "pack.cpp", "#extra/plugin/dep/sqlite3/rng_get_bytes.c", "#extra/plugin/dep/sqlite3/sqlite3.c"], CPPDEFINES = defines)
 if ARGUMENTS.get("no_shared_plugins", "0") == "0":
-	avxenv.SharedLibrary("#release/lib/nvgt_sqlite", ["nvgt_sqlite.cpp", scriptarray, sqlite_addons], LIBS = ["PocoFoundationMT", "PocoDataSQLiteMT"] if avxenv["PLATFORM"] == "win32" else ["PocoFoundation", "PocoDataSQLite"])
+	avxenv.SharedLibrary("#release/lib/nvgt_sqlite", ["nvgt_sqlite.cpp", scriptarray, sqlite_addons], LIBS = ["PocoFoundation"] if avxenv["PLATFORM"] != "win32" else [])
 static = avxenv.Object("nvgt_sqlite_static", "nvgt_sqlite.cpp", CPPDEFINES = [("NVGT_PLUGIN_STATIC", "nvgt_sqlite")])
 static = avxenv.StaticLibrary("#build/lib/nvgt_sqlite", [static, sqlite_addons])
-static = [static, "PocoDataSQLiteMT" if avxenv["PLATFORM"] == "win32" else "PocoDataSQLite"]
 Return("static")