Browse Source

magnum-integration macos arm64 (#3769)

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua
c8ef 1 year ago
parent
commit
79a5f74631

+ 2 - 0
packages/c/corrade/xmake.lua

@@ -23,6 +23,8 @@ package("corrade")
     end)
     end)
 
 
     on_install("windows", "linux", "macosx", function (package)
     on_install("windows", "linux", "macosx", function (package)
+        io.replace("src/Corrade/Utility/StlForwardTuple.h", "__tuple", "tuple")
+
         local configs = {"-DBUILD_TESTS=OFF", "-DLIB_SUFFIX="}
         local configs = {"-DBUILD_TESTS=OFF", "-DLIB_SUFFIX="}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DCORRADE_BUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON"))
         table.insert(configs, "-DCORRADE_BUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON"))

+ 1 - 1
packages/m/magnum-integration/xmake.lua

@@ -26,7 +26,7 @@ package("magnum-integration")
         end
         end
     end)
     end)
 
 
-    on_install("windows", "linux", "macosx|x86_64", function (package)
+    on_install("windows", "linux", "macosx", function (package)
         local configs = {"-DBUILD_TESTS=OFF", "-DLIB_SUFFIX="}
         local configs = {"-DBUILD_TESTS=OFF", "-DLIB_SUFFIX="}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON"))
         table.insert(configs, "-DBUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON"))

+ 1 - 1
packages/m/magnum/xmake.lua

@@ -72,7 +72,7 @@ package("magnum")
         end
         end
     end)
     end)
 
 
-    on_install("windows", "linux", "macosx|x86_64", function (package)
+    on_install("windows", "linux", "macosx", function (package)
         io.replace("modules/FindSDL2.cmake", "SDL2-2.0 SDL2", "SDL2-2.0 SDL2 SDL2-static", {plain = true})
         io.replace("modules/FindSDL2.cmake", "SDL2-2.0 SDL2", "SDL2-2.0 SDL2 SDL2-static", {plain = true})
         io.replace("modules/FindSDL2.cmake", "${_SDL2_LIBRARY_PATH_SUFFIX}", "lib ${_SDL2_LIBRARY_PATH_SUFFIX}", {plain = true})
         io.replace("modules/FindSDL2.cmake", "${_SDL2_LIBRARY_PATH_SUFFIX}", "lib ${_SDL2_LIBRARY_PATH_SUFFIX}", {plain = true})
         local configs = {"-DBUILD_TESTS=OFF", "-DLIB_SUFFIX="}
         local configs = {"-DBUILD_TESTS=OFF", "-DLIB_SUFFIX="}