Simplify build target for now

codecat · Mar 2, 2022 · 08bef56 · 08bef56
1 parent 5293246
commit 08bef56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/SConstruct b/SConstruct
@@ -21,15 +21,15 @@ sources += Glob("src/map/*.cpp")
 
 if env["platform"] == "osx":
 	library = env.SharedLibrary(
-		"addons/tbloader/bin/libtbloader.{}.{}.framework/libtbloader.{}.{}".format(
-			env["platform"], env["target"], env["platform"], env["target"]
+		"addons/tbloader/bin/libtbloader.{}.framework/libtbloader.{}".format(
+			env["platform"], env["platform"]
 		),
 		source=sources,
 	)
 else:
 	library = env.SharedLibrary(
-		"addons/tbloader/bin/tbloader.{}.{}.{}{}".format(
-			env["platform"], env["target"], env["arch_suffix"], env["SHLIBSUFFIX"]
+		"addons/tbloader/bin/tbloader.{}.{}{}".format(
+			env["platform"], env["arch_suffix"], env["SHLIBSUFFIX"]
 		),
 		source=sources,
 	)

diff --git a/addons/tbloader/tbloader.gdextension b/addons/tbloader/tbloader.gdextension
@@ -2,9 +2,6 @@
 entry_symbol = "tbloader_init"
 
 [libraries]
-linux.64.debug = "bin/tbloader.linux.debug.64.so"
-linux.64.release = "bin/tbloader.linux.release.64.so"
-windows.64.debug = "bin/tbloader.windows.debug.64.dll"
-windows.64.release = "bin/tbloader.windows.release.64.dll"
-macos.64.debug = "bin/libtbloader.debug.framework"
-macos.64.release = "bin/libtbloader.release.framework"
+windows.64 = "bin/tbloader.windows.64.dll"
+linux.64 = "bin/tbloader.linux.64.so"
+macos.64 = "bin/libtbloader.framework"