dominus

Untitled

Sep 25th, 2020
1,082
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/makefile b/makefile
  2. index 4ec2186cac3..ab3cd164ddc 100644
  3. --- a/makefile
  4. +++ b/makefile
  5. @@ -284,11 +284,14 @@ ARCHITECTURE := _x64
  6.  endif
  7.  ifeq ($(PROCESSOR_ARCHITECTURE),x86)
  8.  ARCHITECTURE := _x64
  9. +ifeq ($(PROCESSOR_ARCHITECTURE),ARM6)
  10. +ARCHITECTURE := _arm64
  11.  ifeq ($(PROCESSOR_ARCHITEW6432),AMD64)
  12.  else
  13.  ARCHITECTURE := _x86
  14.  endif
  15.  endif
  16. +endif
  17.  else
  18.  UNAME    := $(shell uname -mps)
  19.  TARGETOS := $(OS)
  20. @@ -304,9 +307,13 @@ else
  21.  ifeq ($(ARCHITECTURE),_x64)
  22.  MPARAM := -m64
  23.  else
  24. +ifeq ($(ARCHITECTURE),_arm64)
  25. +MPARAM :=
  26. +else
  27.  MPARAM :=
  28.  endif
  29.  endif
  30. +endif
  31.  
  32.  ARCHITECTURE := _x86
  33.  
  34. diff --git a/scripts/genie.lua b/scripts/genie.lua
  35. index 5310e003ed8..fca710ca67a 100644
  36. --- a/scripts/genie.lua
  37. +++ b/scripts/genie.lua
  38. @@ -464,6 +464,7 @@ configurations {
  39.  if _ACTION == "xcode4" then
  40.     platforms {
  41.         "x64",
  42. +       "ARM64"
  43.     }
  44.  else
  45.     platforms {
  46. @@ -685,12 +686,12 @@ else
  47.             linkoptions {
  48.                 "-arch x86_64",
  49.             }
  50. -       configuration { "x32" }
  51. +       configuration { "ARM64"}
  52.             buildoptions {
  53. -               "-arch i386",
  54. +               "-arch ARM64",
  55.             }
  56.             linkoptions {
  57. -               "-arch i386",
  58. +               "-arch ARM64",
  59.             }
  60.         configuration { }
  61.     end
  62. diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
  63. index 3eb2acf0e0b..dedc09da94c 100644
  64. --- a/scripts/toolchain.lua
  65. +++ b/scripts/toolchain.lua
  66. @@ -1076,6 +1076,18 @@ function toolchain(_buildDir, _subDir)
  67.  
  68.     configuration { "osx*", "x64", "Debug" }
  69.         targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug")
  70. +      
  71. +   configuration { "osx*", "ARM64" }
  72. +       objdir (_buildDir .. "osx_clang" .. "/obj")
  73. +       buildoptions {
  74. +           "-m64", "-DHAVE_IMMINTRIN_H=1",
  75. +       }
  76. +
  77. +   configuration { "osx*", "ARM64", "Release" }
  78. +       targetdir (_buildDir .. "osx_clang" .. "/bin/ARM64/Release")
  79. +
  80. +   configuration { "osx*", "ARM64", "Debug" }
  81. +       targetdir (_buildDir .. "osx_clang" .. "/bin/ARM64/Debug")
  82.  
  83.     configuration { "ios-arm" }
  84.         targetdir (_buildDir .. "ios-arm" .. "/bin")
  85.  
RAW Paste Data