Merge branch 'fh' into sound

1251fa93 · mercury233 · 8761314a · 738a2bf7 · 1251fa93 · a4e17256
Commit 1251fa93 authored Mar 28, 2018 by mercury233
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

gframe/premake4.lua gframe/premake4.lua +1 -1

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/premake4.lua
+++ b/gframe/premake4.lua
@@ -28,7 +28,7 @@ project "ygopro"
    configuration "not vs*"
        buildoptions { "-std=gnu++0x", "-fno-rtti" }
    configuration "not windows"
-        includedirs { "/usr/include/lua", "/usr/include/lua5.2", "/usr/include/lua/5.2", "/usr/include/irrlicht", "/usr/include/freetype2" }
+        includedirs { "/usr/include/lua", "/usr/include/lua5.3", "/usr/include/lua/5.3", "/usr/include/irrlicht", "/usr/include/freetype2" }
        excludes { "COSOperator.*" }
        links { "event_pthreads", "GL", "dl", "pthread" }
    configuration "linux"

--- a/ocgcore @ a4e17256
+++ b/ocgcore @ a4e17256
-Subproject commit 6b7783b9d46bfcfaa6e2d302fb0065665cc0aa8a
+Subproject commit a4e17256838bf1b657238f554362d9cc9841b233
--- a/script @ eacd96e1
+++ b/script @ eacd96e1
-Subproject commit 47a1517ad08adc9ef37933cc2388b57d38ab277f
+Subproject commit eacd96e1bc6ed66c00947d30adacffd0157ba8e8