Commit d2318bce authored by wind2009's avatar wind2009

Merge remote-tracking branch 'upstream/master' into develop

parents 39a1b86e e84e059b
Pipeline #33656 passed with stages
in 8 minutes and 5 seconds
project "clzma"
kind "StaticLib"
cdialect "C11"
files { "*.c", "*.h" }
......@@ -3,8 +3,6 @@ include "spmemvfs/."
project "YGOPro"
kind "WindowedApp"
cdialect "C11"
cppdialect "C++14"
files { "*.cpp", "*.h" }
includedirs { "../ocgcore" }
......@@ -67,7 +65,7 @@ project "YGOPro"
end
links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
filter "not action:vs*"
buildoptions { "-fno-rtti" }
buildoptions { "-std=c++14", "-fno-rtti" }
filter "not system:windows"
links { "event_pthreads", "dl", "pthread" }
filter "system:macosx"
......
project "cspmemvfs"
kind "StaticLib"
cdialect "C11"
files { "*.c", "*.h" }
if BUILD_SQLITE then
......
project "event"
kind "StaticLib"
cdialect "C11"
includedirs { "include", "compat" }
......
project "freetype"
kind "StaticLib"
cdialect "C11"
includedirs { "include" }
defines { "FT2_BUILD_LIBRARY" }
......
project "irrlicht"
kind "StaticLib"
cdialect "C11"
cppdialect "C++14"
includedirs { "include", "source/Irrlicht", "source/Irrlicht/jpeglib", "source/Irrlicht/libpng", "source/Irrlicht/zlib" }
......
project "lua"
kind "StaticLib"
cdialect "C11"
cppdialect "C++14"
files { "src/*.c", "src/*.h", "src/*.hpp" }
removefiles { "src/lua.c", "src/luac.c" }
......
project "sqlite3"
kind "StaticLib"
cdialect "C11"
files { "sqlite3.c", "sqlite3.h" }
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