fixes for staticlib

gluonhq · Sep 5, 2024 · 489d6a0 · 489d6a0
1 parent fb547dd
commit 489d6a0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/gluonhq/substrate/target/AbstractTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/AbstractTargetConfiguration.java
@@ -195,6 +195,7 @@ public boolean link() throws IOException, InterruptedException {
         String appName = projectConfiguration.getAppName();
         Path gvmPath = paths.getGvmPath();
         Path objectFile = getProjectObjectFile();
+        List<String> linkerLibraryPathFlags = getLinkerLibraryPathFlags();
 
         if (projectConfiguration.isStaticLibrary()) {
             return true;
@@ -218,7 +219,7 @@ public boolean link() throws IOException, InterruptedException {
                 projectConfiguration.isUsePrismSW()));
 
         linkRunner.addArgs(getTargetSpecificLinkOutputFlags());
-        linkRunner.addArgs(getLinkerLibraryPathFlags());
+        linkRunner.addArgs(linkerLibraryPathFlags);
         linkRunner.addArgs(getNativeLibsLinkFlags());
         linkRunner.addArgs(projectConfiguration.getLinkerArgs());
         linkRunner.setInfo(true);
@@ -330,7 +331,6 @@ public boolean createStaticLib() throws IOException, InterruptedException {
         Path dest = paths.getGvmPath().resolve("lib" + projectConfiguration.getAppName() + ".a");
         createStaticLibRunner.addArg(dest.toString());
         createStaticLibRunner.addArg(getProjectObjectFile().toString());
-        createStaticLibRunner.addArgs(getAdditionalObjectFiles());
         createStaticLibRunner.setInfo(true);
         createStaticLibRunner.setLogToFile(true);
         int result = createStaticLibRunner.runProcess("archive");
@@ -351,7 +351,7 @@ protected boolean compileAdditionalSources()
         Path workDir = paths.getGvmPath().resolve(appName);
         Files.createDirectories(workDir);
 
-        if (getAdditionalSourceFiles().isEmpty()) {
+        if (projectConfiguration.isStaticLibrary() || getAdditionalSourceFiles().isEmpty()) {
             return true;
         }
 

diff --git a/src/main/java/com/gluonhq/substrate/target/AndroidTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/AndroidTargetConfiguration.java
@@ -331,7 +331,7 @@ public String getAdditionalSourceFileLocation() {
     @Override
     List<String> getAdditionalSourceFiles() {
         List<String> answer = new ArrayList<>(androidAdditionalDummySourceFiles);
-        if (!projectConfiguration.isSharedLibrary() && !projectConfiguration.isStaticLibrary()) {
+        if (!projectConfiguration.isSharedLibrary()) {
             answer.addAll(androidAdditionalSourceFiles);
             if (projectConfiguration.hasWeb()) {
                 answer.addAll(androidAdditionalWebSourceFiles);

diff --git a/src/main/java/com/gluonhq/substrate/target/IosTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/IosTargetConfiguration.java
@@ -165,7 +165,7 @@ public String getAdditionalSourceFileLocation() {
     @Override
     List<String> getAdditionalSourceFiles() {
         List<String> answer = new ArrayList<>(iosAdditionalDummySourceFiles);
-        if (!projectConfiguration.isSharedLibrary() && !projectConfiguration.isStaticLibrary()) {
+        if (!projectConfiguration.isSharedLibrary()) {
             answer.addAll(iosAdditionalSourceFiles);
         }
         return answer;

diff --git a/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/LinuxTargetConfiguration.java
@@ -218,7 +218,7 @@ List<String> getOtherStaticLibs() {
 
     @Override
     List<String> getAdditionalSourceFiles() {
-        if (projectConfiguration.isSharedLibrary() || projectConfiguration.isStaticLibrary()) {
+        if (projectConfiguration.isSharedLibrary()) {
             return List.of();
         }
         return super.getAdditionalSourceFiles();

diff --git a/src/main/java/com/gluonhq/substrate/target/MacOSTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/MacOSTargetConfiguration.java
@@ -77,7 +77,7 @@ String getAdditionalSourceFileLocation() {
 
     @Override
     List<String> getAdditionalSourceFiles() {
-        if (projectConfiguration.isSharedLibrary() || projectConfiguration.isStaticLibrary()) {
+        if (projectConfiguration.isSharedLibrary()) {
             return List.of();
         }
         return Arrays.asList("AppDelegate.m", "launcher.c");

diff --git a/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java b/src/main/java/com/gluonhq/substrate/target/WindowsTargetConfiguration.java
@@ -311,7 +311,7 @@ private boolean executableOnPath(String executable) {
 
     @Override
     List<String> getAdditionalSourceFiles() {
-        if (projectConfiguration.isSharedLibrary() || projectConfiguration.isStaticLibrary()) {
+        if (projectConfiguration.isSharedLibrary()) {
             return List.of();
         }
         return super.getAdditionalSourceFiles();