linuxarm thing

HomuHomu833 · HomuHomu833 · commit efeea93fb48d · 2024-10-26T14:01:45.000+03:00
diff --git a/tools/hxcpp/BuildTool.hx b/tools/hxcpp/BuildTool.hx
@@ -66,6 +66,7 @@ class BuildTool
    var mNvccLinkFlags:Array<String>;
    var mDirtyList:Array<String>;
    var arm64:Bool;
+   var armv7:Bool;
    var m64:Bool;
    var m32:Bool;
 
@@ -134,15 +135,17 @@ class BuildTool
       m64 = mDefines.exists("HXCPP_M64");
       m32 = mDefines.exists("HXCPP_M32");
       arm64 = mDefines.exists("HXCPP_ARM64");
-      var otherArmArchitecture = mDefines.exists("HXCPP_ARMV6") || mDefines.exists("HXCPP_ARMV7") || mDefines.exists("HXCPP_ARMV7S");
-      if (m64==m32 && !arm64 && !otherArmArchitecture)
+      armv7 = mDefines.exists("HXCPP_ARMV7");
+      var otherArmArchitecture = mDefines.exists("HXCPP_ARMV6") || mDefines.exists("HXCPP_ARMV7S");
+      if (m64==m32 && !arm64 && !armv7 && !otherArmArchitecture)
       {
          var arch = mDefines.get("HXCPP_ARCH");
          if (arch!=null)
          {
             m64 = arch=="x86_64";
             m32 = arch=="x86";
             arm64 = arch=="arm64";
+            armv7 = arch=="armv7";
          }
          else
          {
@@ -152,6 +155,7 @@ class BuildTool
             m64 = hostArch=="m64";
             m32 = hostArch=="m32";
             arm64 = hostArch=="arm64";
+            armv7 = hostArch=="armv7";
          }
 
          mDefines.remove(m32 ? "HXCPP_M64" : "HXCPP_M32");
@@ -576,7 +580,7 @@ class BuildTool
                   first = false;
                   Log.lock();
                   Log.println("");
-                  Log.info("\x1b[33;1mCompiling group: " + group.mId + " (" + to_be_compiled.length + " file" + (to_be_compiled.length==1 ? "" : "s") + ")\x1b[0m");
+                  Log.info("\x1b[33;1mCompiling group: " + group.mId + "\x1b[0m");
                   var message = "\x1b[1m" + (nvcc ? getNvcc() : mCompiler.mExe) + "\x1b[0m";
                   var flags = group.mCompilerFlags;
                   if (!nvcc)
@@ -612,15 +616,10 @@ class BuildTool
          } : null;
 
          Profile.push("compile");
-
-         var compile_progress = null;
-         if (!Log.verbose)
-            compile_progress = new Progress(0,to_be_compiled.length);
-
          if (threadPool==null)
          {
             for(file in to_be_compiled)
-               mCompiler.compile(file,-1,groupHeader,pchStamp,compile_progress);
+               mCompiler.compile(file,-1,groupHeader,pchStamp);
          }
          else
          {
@@ -636,7 +635,7 @@ class BuildTool
                         break;
                      var file = to_be_compiled[index];
 
-                     compiler.compile(file,threadId,groupHeader,pchStamp,compile_progress);
+                     compiler.compile(file,threadId,groupHeader,pchStamp);
                   }
             });
          }
@@ -2065,21 +2064,21 @@ class BuildTool
             defines.set("toolchain","linux");
             defines.set("linux","linux");
 
-            if (defines.exists("HXCPP_LINUX_ARMV7"))
+            if (armv7)
             {
                defines.set("noM32","1");
                defines.set("noM64","1");
                defines.set("HXCPP_ARMV7","1");
                m64 = false;
             }
-            else if (arm64 || defines.exists("HXCPP_LINUX_ARM64"))
+            else if (arm64)
             {
                defines.set("noM32","1");
                defines.set("noM64","1");
                defines.set("HXCPP_ARM64","1");
                m64 = true;
             }
-            defines.set("BINDIR", arm64 ? "LinuxArm64" : m64 ? "Linux64" : "Linux");
+            defines.set("BINDIR", arm64 ? "LinuxArm64" : armv7 ? "LinuxArm" : m64 ? "Linux64" : "Linux");
          }
       }
       else if ( (new EReg("mac","i")).match(os) )
@@ -2411,7 +2410,7 @@ class BuildTool
       if (isArm64)
       {
          outDefines.set("HXCPP_ARM64","1");
-         outDefines.remove("HXCPP_M64");
+         outDefines.set("HXCPP_M64","1");
          outDefines.remove("HXCPP_32");
       }
       else if (in64)

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ class BuildTool`
`66`	`66`	`var mNvccLinkFlags:Array<String>;`
`67`	`67`	`var mDirtyList:Array<String>;`
`68`	`68`	`var arm64:Bool;`
	`69`	`+ var armv7:Bool;`
`69`	`70`	`var m64:Bool;`
`70`	`71`	`var m32:Bool;`
`71`	`72`
`@@ -134,15 +135,17 @@ class BuildTool`
`134`	`135`	`m64 = mDefines.exists("HXCPP_M64");`
`135`	`136`	`m32 = mDefines.exists("HXCPP_M32");`
`136`	`137`	`arm64 = mDefines.exists("HXCPP_ARM64");`
`137`		`- var otherArmArchitecture = mDefines.exists("HXCPP_ARMV6") \|\| mDefines.exists("HXCPP_ARMV7") \|\| mDefines.exists("HXCPP_ARMV7S");`
`138`		`- if (m64==m32 && !arm64 && !otherArmArchitecture)`
	`138`	`+ armv7 = mDefines.exists("HXCPP_ARMV7");`
	`139`	`+ var otherArmArchitecture = mDefines.exists("HXCPP_ARMV6") \|\| mDefines.exists("HXCPP_ARMV7S");`
	`140`	`+ if (m64==m32 && !arm64 && !armv7 && !otherArmArchitecture)`
`139`	`141`	`{`
`140`	`142`	`var arch = mDefines.get("HXCPP_ARCH");`
`141`	`143`	`if (arch!=null)`
`142`	`144`	`{`
`143`	`145`	`m64 = arch=="x86_64";`
`144`	`146`	`m32 = arch=="x86";`
`145`	`147`	`arm64 = arch=="arm64";`
	`148`	`+ armv7 = arch=="armv7";`
`146`	`149`	`}`
`147`	`150`	`else`
`148`	`151`	`{`
`@@ -152,6 +155,7 @@ class BuildTool`
`152`	`155`	`m64 = hostArch=="m64";`
`153`	`156`	`m32 = hostArch=="m32";`
`154`	`157`	`arm64 = hostArch=="arm64";`
	`158`	`+ armv7 = hostArch=="armv7";`
`155`	`159`	`}`
`156`	`160`
`157`	`161`	`mDefines.remove(m32 ? "HXCPP_M64" : "HXCPP_M32");`
`@@ -576,7 +580,7 @@ class BuildTool`
`576`	`580`	`first = false;`
`577`	`581`	`Log.lock();`
`578`	`582`	`Log.println("");`
`579`		`- Log.info("\x1b[33;1mCompiling group: " + group.mId + " (" + to_be_compiled.length + " file" + (to_be_compiled.length==1 ? "" : "s") + ")\x1b[0m");`
	`583`	`+ Log.info("\x1b[33;1mCompiling group: " + group.mId + "\x1b[0m");`
`580`	`584`	`var message = "\x1b[1m" + (nvcc ? getNvcc() : mCompiler.mExe) + "\x1b[0m";`
`581`	`585`	`var flags = group.mCompilerFlags;`
`582`	`586`	`if (!nvcc)`
`@@ -612,15 +616,10 @@ class BuildTool`
`612`	`616`	`} : null;`
`613`	`617`
`614`	`618`	`Profile.push("compile");`
`615`		`-`
`616`		`- var compile_progress = null;`
`617`		`- if (!Log.verbose)`
`618`		`- compile_progress = new Progress(0,to_be_compiled.length);`
`619`		`-`
`620`	`619`	`if (threadPool==null)`
`621`	`620`	`{`
`622`	`621`	`for(file in to_be_compiled)`
`623`		`- mCompiler.compile(file,-1,groupHeader,pchStamp,compile_progress);`
	`622`	`+ mCompiler.compile(file,-1,groupHeader,pchStamp);`
`624`	`623`	`}`
`625`	`624`	`else`
`626`	`625`	`{`
`@@ -636,7 +635,7 @@ class BuildTool`
`636`	`635`	`break;`
`637`	`636`	`var file = to_be_compiled[index];`
`638`	`637`
`639`		`- compiler.compile(file,threadId,groupHeader,pchStamp,compile_progress);`
	`638`	`+ compiler.compile(file,threadId,groupHeader,pchStamp);`
`640`	`639`	`}`
`641`	`640`	`});`
`642`	`641`	`}`
`@@ -2065,21 +2064,21 @@ class BuildTool`
`2065`	`2064`	`defines.set("toolchain","linux");`
`2066`	`2065`	`defines.set("linux","linux");`
`2067`	`2066`
`2068`		`- if (defines.exists("HXCPP_LINUX_ARMV7"))`
	`2067`	`+ if (armv7)`
`2069`	`2068`	`{`
`2070`	`2069`	`defines.set("noM32","1");`
`2071`	`2070`	`defines.set("noM64","1");`
`2072`	`2071`	`defines.set("HXCPP_ARMV7","1");`
`2073`	`2072`	`m64 = false;`
`2074`	`2073`	`}`
`2075`		`- else if (arm64 \|\| defines.exists("HXCPP_LINUX_ARM64"))`
	`2074`	`+ else if (arm64)`
`2076`	`2075`	`{`
`2077`	`2076`	`defines.set("noM32","1");`
`2078`	`2077`	`defines.set("noM64","1");`
`2079`	`2078`	`defines.set("HXCPP_ARM64","1");`
`2080`	`2079`	`m64 = true;`
`2081`	`2080`	`}`
`2082`		`- defines.set("BINDIR", arm64 ? "LinuxArm64" : m64 ? "Linux64" : "Linux");`
	`2081`	`+ defines.set("BINDIR", arm64 ? "LinuxArm64" : armv7 ? "LinuxArm" : m64 ? "Linux64" : "Linux");`
`2083`	`2082`	`}`
`2084`	`2083`	`}`
`2085`	`2084`	`else if ( (new EReg("mac","i")).match(os) )`
`@@ -2411,7 +2410,7 @@ class BuildTool`
`2411`	`2410`	`if (isArm64)`
`2412`	`2411`	`{`
`2413`	`2412`	`outDefines.set("HXCPP_ARM64","1");`
`2414`		`- outDefines.remove("HXCPP_M64");`
	`2413`	`+ outDefines.set("HXCPP_M64","1");`
`2415`	`2414`	`outDefines.remove("HXCPP_32");`
`2416`	`2415`	`}`
`2417`	`2416`	`else if (in64)`