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

84355e54 · wind2009 · 0361adca · d5a7ebc3 · 84355e54 · 84355e54
Commit 84355e54 authored Mar 15, 2025 by wind2009
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

premake/lua.lua premake/lua.lua +2 -0

premake5.lua premake5.lua +3 -1

No files found.
--- a/premake/lua.lua
+++ b/premake/lua.lua
 project "lua"
    kind "StaticLib"
+    cdialect "C11"
+    cppdialect "C++14"

    files { "src/*.c", "src/*.h", "src/*.hpp" }
    removefiles { "src/lua.c", "src/luac.c" }

--- a/premake5.lua
+++ b/premake5.lua
 project "ocgcore"
    kind "StaticLib"
+    cdialect "C11"
+    cppdialect "C++14"

    files { "*.cpp", "*.h" }
    links { LUA_LIB_NAME }
@@ -12,7 +14,7 @@ project "ocgcore"
    end

    filter "not action:vs*"
-        buildoptions { "-std=c++14" }
+        buildoptions { }

    filter "system:bsd"
        defines { "LUA_USE_POSIX" }