Improve handling when cross-compiling DLL

calamity-inc · May 24, 2024 · 68dbeca · 68dbeca
1 parent a4449d6
commit 68dbeca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/Sun/sun.cpp b/Sun/sun.cpp
@@ -383,7 +383,7 @@ struct Project
 					if (!opt_static)
 					{
 						// Tell linker to include the static library
-						compiler.extra_linker_args.emplace_back(soup::string::fixType(dep_proj.getOutFile(dep_name).u8string()));
+						compiler.extra_linker_args.emplace_back(soup::string::fixType(dep_proj.getOutFile().u8string()));
 					}
 				}
 				else //if (dep_proj.opt_dynamic)
@@ -505,19 +505,18 @@ struct Project
 
 	[[nodiscard]] std::filesystem::path getOutFile() const
 	{
-		return getOutFile(getName());
-	}
-
-	[[nodiscard]] std::filesystem::path getOutFile(std::string name) const
-	{
+		std::string name = getName();
 		if (opt_static)
 		{
 			name.append(soup::Compiler::getStaticLibraryExtension());
 		}
 		else if (opt_dynamic)
 		{
 #if SOUP_LINUX
-			name.insert(0, "lib");
+			if (!getCompiler().isCrossCompiler())
+			{
+				name.insert(0, "lib");
+			}
 #endif
 			name.append(getCompiler().getDynamicLibraryExtension());
 		}
@@ -713,7 +712,7 @@ int entry(std::vector<std::string>&& args, bool console)
 			{
 				std::cout << ">>> Running...\n";
 				args.erase(args.cbegin(), args.cbegin() + 2);
-				std::cout << soup::os::execute(soup::string::fixType(proj.getOutFile(outname).u8string()), std::move(args));
+				std::cout << soup::os::execute(soup::string::fixType(proj.getOutFile().u8string()), std::move(args));
 			}
 
 			return E_OK;

diff --git a/Sun/vendor/Soup/soup/Compiler.cpp b/Sun/vendor/Soup/soup/Compiler.cpp
@@ -158,11 +158,13 @@ NAMESPACE_SOUP
 		{
 			return ".js";
 		}
-#if SOUP_WINDOWS
-		return ".dll";
-#else
-		return ".so";
+#if SOUP_LINUX
+		if (!isCrossCompiler())
+		{
+			return ".so";
+		}
 #endif
+		return ".dll";
 	}
 
 	std::string Compiler::makeDynamicLibrary(const std::string& in, const std::string& out) const