Update code

Author: xpenatan

examples/SharedLib/libA/lib-build/src/main/java/BuildLibA.java

@@ -120,6 +120,7 @@ private static BuildMultiTarget getWindowVCTarget(BuildToolOptions op) {
         linkTarget.headerDirs.add("-I" + op.getCustomSourceDir());
         linkTarget.headerDirs.add("-I" + libBuildCPPPath + "/src/jniglue");
         linkTarget.linkerFlags.add("/WHOLEARCHIVE:" + libBuildCPPPath + "/libs/windows/vc/" + op.libName + "64_.lib");
+        linkTarget.linkerFlags.add("-DLL");
         linkTarget.cppInclude.add(libBuildCPPPath + "/src/jniglue/JNIGlue.cpp");
         multiTarget.add(linkTarget);
 

examples/SharedLib/libB/lib-build/src/main/java/BuildLibB.java

@@ -136,6 +136,7 @@ private static BuildMultiTarget getWindowVCTarget(BuildToolOptions op, String li
         linkTarget.headerDirs.add("-I" + libACustomPath);
         linkTarget.linkerFlags.add("/WHOLEARCHIVE:" + libALibPath + "/LibA64.lib");
         linkTarget.linkerFlags.add("/WHOLEARCHIVE:" + libBuildCPPPath + "/libs/windows/vc/" + op.libName + "64_.lib");
+        linkTarget.linkerFlags.add("-DLL");
         linkTarget.cppInclude.add(libBuildCPPPath + "/src/jniglue/JNIGlue.cpp");
         multiTarget.add(linkTarget);
 

examples/TestLib/lib/lib-build/src/main/java/BuildLib.java

@@ -88,6 +88,7 @@ private static BuildMultiTarget getWindowTarget(BuildToolOptions op) {
         linkTarget.linkerFlags.add("-Wl,--whole-archive");
         linkTarget.linkerFlags.add(libBuildCPPPath + "/libs/windows/" + op.libName + "64_.a");
         linkTarget.linkerFlags.add("-Wl,--no-whole-archive");
+        linkTarget.linkerFlags.add("-DLL");
         linkTarget.cppInclude.add(libBuildCPPPath + "/src/jniglue/JNIGlue.cpp");
         multiTarget.add(linkTarget);
 

jParser/jParser-build/src/main/java/com/github/xpenatan/jParser/builder/DefaultBuildTarget.java

@@ -16,6 +16,7 @@ public abstract class DefaultBuildTarget extends BuildTarget {
     private static String helperNameCpp = "IDLHelper.cpp";
 
     public boolean multiCoreCompile = true;
+    public boolean addIDLHelper = true;
 
     public String tempBuildDir;
 
@@ -67,20 +68,10 @@ protected boolean buildInternal(BuildConfig config) {
         }
         childTarget.mkdirs();
 
-        idlDir = config.buildRootGenSourcePath.child("idl");
-        if(!idlDir.exists()) {
-            idlDir.mkdirs();
+        if(addIDLHelper) {
+            addIDLHelper(config);
         }
 
-        idlHelperHClasspath = new CustomFileDescriptor(helperNameH, CustomFileDescriptor.FileType.Classpath);
-        idlHelperCPPClasspath = new CustomFileDescriptor(helperNameCpp, CustomFileDescriptor.FileType.Classpath);
-        idlHelperHFile = idlDir.child(idlHelperHClasspath.name());
-        idlHelperCPPFile = idlDir.child(idlHelperCPPClasspath.name());
-
-        // Always add IDLHelper, even if not used.
-        copyIDLHelperToBuildDir();
-        headerDirs.add("-I" + idlDir.path());
-
         setup(config);
         return build(config, childTarget);
     }
@@ -261,7 +252,9 @@ protected void onLink(ArrayList<CustomFileDescriptor> compiledObjects, String ob
         }
         else {
             linkerCommands.addAll(linkerCompiler);
-            linkerCommands.add("@" + objFilePath); // Objects must be before flags and linking flags
+            if(!compiledObjects.isEmpty()) {
+                linkerCommands.add("@" + objFilePath); // Objects must be before flags and linking flags
+            }
             linkerCommands.addAll(linkerFlags);
             linkerCommands.add(linkerOutputCommand + libPath);
         }
@@ -339,7 +332,23 @@ public static void getObjectFiles(CustomFileDescriptor file, ArrayList<CustomFil
         }
     }
 
-    public void copyIDLHelperToBuildDir() {
+    private void addIDLHelper(BuildConfig config) {
+        idlDir = config.buildRootGenSourcePath.child("idl");
+        if(!idlDir.exists()) {
+            idlDir.mkdirs();
+        }
+
+        idlHelperHClasspath = new CustomFileDescriptor(helperNameH, CustomFileDescriptor.FileType.Classpath);
+        idlHelperCPPClasspath = new CustomFileDescriptor(helperNameCpp, CustomFileDescriptor.FileType.Classpath);
+        idlHelperHFile = idlDir.child(idlHelperHClasspath.name());
+        idlHelperCPPFile = idlDir.child(idlHelperCPPClasspath.name());
+
+        // Always add IDLHelper, even if not used.
+        copyIDLHelperToBuildDir();
+        headerDirs.add("-I" + idlDir.path());
+    }
+
+    private void copyIDLHelperToBuildDir() {
         idlHelperHClasspath.copyTo(idlDir, false);
         idlHelperCPPClasspath.copyTo(idlDir, false);
     }

jParser/jParser-build/src/main/java/com/github/xpenatan/jParser/builder/targets/WindowsMSVCTarget.java

@@ -25,6 +25,13 @@ public WindowsMSVCTarget() {
         cppCompiler.add("x64");
         cppCompiler.add("&");
         cppCompiler.add("cl");
+
+        linkerCompiler.add("cmd");
+        linkerCompiler.add("/c");
+        linkerCompiler.add("vcvarsall");
+        linkerCompiler.add("x64");
+        linkerCompiler.add("&");
+
         compilerOutputCommand = "-Fo:";
         cppFlags.add("-c");
         if(DEBUG_BUILD) {
@@ -40,11 +47,6 @@ public WindowsMSVCTarget() {
 
     @Override
     protected void setup(BuildConfig config) {
-        linkerCompiler.add("cmd");
-        linkerCompiler.add("/c");
-        linkerCompiler.add("vcvarsall");
-        linkerCompiler.add("x64");
-        linkerCompiler.add("&");
         if(isStatic) {
             linkerCompiler.add("lib");
             libSuffix = "64_.lib";
@@ -54,7 +56,6 @@ protected void setup(BuildConfig config) {
             if(DEBUG_BUILD) {
                 linkerCompiler.add("/DEBUG"); // Generates .pbd file
             }
-            linkerFlags.add("-DLL");
         }
         linkerCompiler.add("/NOLOGO");
         linkerCompiler.add("/MACHINE:X64");

jParser/jParser-build/src/main/java/com/github/xpenatan/jParser/builder/targets/WindowsTarget.java

@@ -52,12 +52,10 @@ protected void setup(BuildConfig config) {
             linkerOutputCommand = "";
         }
         else {
-//            linkerFlags.add("-fPIC");
             linkerFlags.add("-shared");
             linkerFlags.add("-static");
             linkerFlags.add("-static-libgcc");
             linkerFlags.add("-static-libstdc++");
-//            linkerFlags.add("-Wl,--kill-at");
             linkerFlags.add("-m64");
             libSuffix = "64.dll";
             linkerOutputCommand = "-o";