Skip to content

Y
ygopro
Commit 5fe1625c authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'develop' into server-develop

parents 59d89b1c 4d9d281d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
premake/irrlicht/premake5.lua
View file @ 5fe1625c
...@@ -64,6 +64,10 @@ project "irrlicht" ...@@ -64,6 +64,10 @@ project "irrlicht"
"PNG_INTEL_SSE", "PNG_INTEL_SSE",
} }
if IS_ARM then
defines { "PNG_ARM_NEON_OPT=0", "PNG_ARM_NEON_IMPLEMENTATION=0" }
end
files { files {
"include/*.h", "include/*.h",
"source/Irrlicht/*.cpp", "source/Irrlicht/*.cpp",
...@@ -159,7 +163,7 @@ project "irrlicht" ...@@ -159,7 +163,7 @@ project "irrlicht"
filter { "system:macosx" } filter { "system:macosx" }
cppdialect "gnu++14" cppdialect "gnu++14"
defines { "GL_SILENCE_DEPRECATION", "PNG_ARM_NEON_OPT=0", "PNG_ARM_NEON_IMPLEMENTATION=0" } defines { "GL_SILENCE_DEPRECATION" }
undefines { "NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_" } undefines { "NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_" }
files { files {
"source/Irrlicht/MacOSX/*.mm", "source/Irrlicht/MacOSX/*.mm",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment