fix wrong matching sdl build type

Author: tranleduy2000

app/src/main/java/com/duy/ccppcompiler/compiler/compilers/NativeCompileImpl.java

@@ -24,6 +24,7 @@
 import com.duy.ccppcompiler.compiler.model.OutputScope;
 import com.duy.ccppcompiler.compiler.shell.ArgumentBuilder;
 import com.duy.ccppcompiler.compiler.shell.CommandResult;
+import com.duy.ccppcompiler.compiler.shell.GccArgumentBuilder;
 import com.duy.ccppcompiler.compiler.shell.Shell;
 import com.duy.ccppcompiler.packagemanager.Environment;
 import com.duy.common.DLog;
@@ -72,6 +73,8 @@ public CommandResult compile(File[] sourceFiles, ILogger logger) {
         argumentBuilder.addFlags(args);
 
         final String cmd = argumentBuilder.build();
+        String debugStr = cmd.replaceAll("\\s+", "\n");
+        if (DLog.DEBUG) DLog.d(TAG, "debugStr = \n" + debugStr);
         if (logger != null) {
             logger.verbose("Compiler argument: " + cmd);
         }
@@ -93,7 +96,7 @@ protected void clean() {
     }
 
     private String buildArgs(File[] sourceFiles) {
-        ArgumentBuilder args = new ArgumentBuilder();
+        GccArgumentBuilder args = new GccArgumentBuilder();
         for (File sourceFile : sourceFiles) {
             args.addFlags(sourceFile.getAbsolutePath());
         }
@@ -118,13 +121,15 @@ private String buildArgs(File[] sourceFiles) {
         return args.build();
     }
 
-    private void resolveLdFlagsFromSource(ArgumentBuilder args, File[] sourceFiles) {
+    private void resolveLdFlagsFromSource(GccArgumentBuilder args, File[] sourceFiles) {
         LinkerFlagsDetector detector = LinkerFlagsDetector.INSTANCE;
         try {
-            final Set<String> detect = detector.detect(sourceFiles);
-            args.addFlags(detect);
+            final Set<String> detected = detector.detect(sourceFiles);
+            for (String f : detected) {
+                args.addFlag(GccArgumentBuilder.Type.LD_FLAG, f);
+            }
         } catch (IOException e) {
-            e.printStackTrace();
+            //unexpected
         }
     }
 
@@ -134,9 +139,10 @@ protected void addUserSettingFlags(ArgumentBuilder args) {
 
     protected abstract String getCompilerProgram();
 
-    private void addDefaultLdFlags(ArgumentBuilder args) {
+    private void addDefaultLdFlags(GccArgumentBuilder args) {
         //lib math and lib log
-        args.addFlags("-lm", "-llog");
+        args.addFlag(GccArgumentBuilder.Type.LD_FLAG, "-lm");
+        args.addFlag(GccArgumentBuilder.Type.LD_FLAG, "-llog");
     }
 
     private void buildExecutableFlags(ArgumentBuilder args, File[] sourceFiles) {
@@ -169,7 +175,7 @@ private void buildNativeActivityFlags(ArgumentBuilder args, File[] sourceFiles)
                 .addFlags("-o", outputScope.getBinaryFile().getAbsolutePath());
     }
 
-    private void buildSDLActivity(ArgumentBuilder args, File[] sourceFiles) {
+    private void buildSDLActivity(GccArgumentBuilder args, File[] sourceFiles) {
         File source = sourceFiles[0];
         String nameNoExt = source.getName().substring(0, source.getName().lastIndexOf("."));
 

app/src/main/java/com/duy/ccppcompiler/compiler/shell/GccArgumentBuilder.java

@@ -8,7 +8,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 
-public class GccArgumentBuilder {
+public class GccArgumentBuilder extends ArgumentBuilder {
     private String program;
     private ArrayList<Pair<Type, String>> mFlags = new ArrayList<>();
 
@@ -32,8 +32,8 @@ public GccArgumentBuilder addFlag(String flag) {
         return this;
     }
 
-    private void addFlag(Type type, String name) {
-        mFlags.add(new Pair<Type, String>(type, name));
+    public void addFlag(Type type, String name) {
+        mFlags.add(new Pair<>(type, name));
     }
 
     public GccArgumentBuilder addFlags(Collection<String> flags) {
@@ -55,11 +55,7 @@ public String build() {
             @SuppressWarnings("ConstantConditions")
             @Override
             public int compare(Pair<Type, String> o1, Pair<Type, String> o2) {
-                if (!o1.first.getPriority().equals(o2.first.getPriority())) {
-                    return o1.first.getPriority().compareTo(o2.first.getPriority());
-                } else {
-                    return o1.second.compareTo(o2.second);
-                }
+                return -o1.first.getPriority().compareTo(o2.first.getPriority());
             }
         });
         Pair<Type, String> prev = null;
@@ -76,15 +72,15 @@ public int compare(Pair<Type, String> o1, Pair<Type, String> o2) {
                 if (cmd.length() != 0) {
                     cmd.append(" ");
                 }
-                cmd.append(flag);
+                cmd.append(name);
                 prev = flag;
             }
         }
         return cmd.toString();
     }
 
 
-    enum Type {
+    public enum Type {
         UNSPECIFIED(4, true),
         CPP_FLAG(3, true),
         C_FLAG(2, true),

app/src/main/java/com/duy/ccppcompiler/ide/editor/CodeEditorActivity.java

@@ -255,7 +255,7 @@ private int detectBuildType() {
                 //#include "android_native_app_glue.h" in C++
                 //#inlcude <android_native_app_glue.h> in C
                 Pattern.compile("#include\\s+([<\"])SDL.h[>\"]");
-        if (nativeActivityPattern.matcher(srcCode).find()) {
+        if (sdl.matcher(srcCode).find()) {
             return NativeCompileImpl.BUILD_SDL_ACTIVITY;
         }