From 0a0b2adc4617d7c6425e61bb97240de0e000b3ef Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Mon, 16 Feb 2026 02:42:17 +0000 Subject: [PATCH] [tools] Fix HXCPP_M64 being set despite HXCPP_X86 HXCPP_X86 means 32 bit x86, so HXCPP_M64 shouldn't be set --- tools/hxcpp/BuildTool.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/hxcpp/BuildTool.hx b/tools/hxcpp/BuildTool.hx index a2c46af5c..82a2b533e 100644 --- a/tools/hxcpp/BuildTool.hx +++ b/tools/hxcpp/BuildTool.hx @@ -136,7 +136,7 @@ class BuildTool instance = this; m64 = mDefines.exists("HXCPP_M64"); - m32 = mDefines.exists("HXCPP_M32"); + m32 = mDefines.exists("HXCPP_M32") || mDefines.exists("HXCPP_X86"); arm64 = mDefines.exists("HXCPP_ARM64"); var otherArmArchitecture = mDefines.exists("HXCPP_ARMV6") || mDefines.exists("HXCPP_ARMV7") || mDefines.exists("HXCPP_ARMV7S"); if (m64==m32 && !arm64 && !otherArmArchitecture) @@ -165,11 +165,11 @@ class BuildTool Profile.setEntry("parse xml"); - + if (mDefines.exists("HXCPP_C_STANDARD")) { defaultCStandard = Std.parseInt(mDefines.get("HXCPP_C_STANDARD")); } - + // Hxcpp requires C++11, so the default standard cannot be less than that if (mDefines.exists("HXCPP_CXX_STANDARD")) { defaultCxxStandard = Std.parseInt(mDefines.get("HXCPP_CXX_STANDARD"));