upgrades codeblock to Lua 5.4.2 (#5556)

* upgrades codeblock to Lua 5.4.2 * fix error * upgrade to c++20 * upgrade to c++20 * upgradeto c++20 * Update wesnothd.cbp
wesnoth · Feb 17, 2021 · 3f13184 · 3f13184
1 parent 54cde58
commit 3f13184
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/projectfiles/CodeBlocks/campaignd.cbp b/projectfiles/CodeBlocks/campaignd.cbp
@@ -29,7 +29,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
-			<Add option="-std=c++17" />
+			<Add option="-std=c++20" />
 			<Add option="-mthreads" />
 			<Add option="-fexceptions" />
 			<Add option="-fdiagnostics-show-option" />

diff --git a/projectfiles/CodeBlocks/liblua.cbp b/projectfiles/CodeBlocks/liblua.cbp
@@ -31,7 +31,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
-			<Add option="-std=c++17" />
+			<Add option="-std=c++20" />
 			<Add option="-U__STRICT_ANSI__" />
 			<Add option="-include ../../src/wesnoth_lua_config.h" />
 			<Add directory="../../src" />
@@ -41,7 +41,6 @@
 		<Unit filename="../../src/lua/lauxlib.cpp" />
 		<Unit filename="../../src/lua/lauxlib.h" />
 		<Unit filename="../../src/lua/lbaselib.cpp" />
-		<Unit filename="../../src/lua/lbitlib.cpp" />
 		<Unit filename="../../src/lua/lcode.cpp" />
 		<Unit filename="../../src/lua/lcode.h" />
 		<Unit filename="../../src/lua/lcorolib.cpp" />
@@ -57,6 +56,7 @@
 		<Unit filename="../../src/lua/lfunc.h" />
 		<Unit filename="../../src/lua/lgc.cpp" />
 		<Unit filename="../../src/lua/lgc.h" />
+		<Unit filename="../../src/lua/ljumptab.h" />
 		<Unit filename="../../src/lua/liolib.cpp" />
 		<Unit filename="../../src/lua/llex.cpp" />
 		<Unit filename="../../src/lua/llex.h" />
@@ -69,6 +69,7 @@
 		<Unit filename="../../src/lua/lobject.h" />
 		<Unit filename="../../src/lua/lopcodes.cpp" />
 		<Unit filename="../../src/lua/lopcodes.h" />
+		<Unit filename="../../src/lua/lopnames.h" />
 		<Unit filename="../../src/lua/loslib.cpp" />
 		<Unit filename="../../src/lua/lparser.cpp" />
 		<Unit filename="../../src/lua/lparser.h" />

diff --git a/projectfiles/CodeBlocks/tests.cbp b/projectfiles/CodeBlocks/tests.cbp
@@ -30,7 +30,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
-			<Add option="-std=c++17" />
+			<Add option="-std=c++20" />
 			<Add option="-mthreads" />
 			<Add option="-fexceptions" />
 			<Add option="-fdiagnostics-show-option" />

diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -30,7 +30,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
-			<Add option="-std=c++17" />
+			<Add option="-std=c++20" />
 			<Add option="-mthreads" />
 			<Add option="-fexceptions" />
 			<Add option="-fdiagnostics-show-option" />

diff --git a/projectfiles/CodeBlocks/wesnothd.cbp b/projectfiles/CodeBlocks/wesnothd.cbp
@@ -29,7 +29,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
-			<Add option="-std=c++17" />
+			<Add option="-std=c++20" />
 			<Add option="-mthreads" />
 			<Add option="-fexceptions" />
 			<Add option="-fdiagnostics-show-option" />