diff options
| -rw-r--r-- | SetFlags.cmake | 7 | ||||
| m--------- | lib/SQLiteCpp | 0 | ||||
| m--------- | lib/lua | 0 | ||||
| m--------- | lib/luaexpat | 0 | ||||
| m--------- | lib/sqlite | 0 | ||||
| m--------- | lib/tolua++ | 0 | ||||
| -rw-r--r-- | src/Bindings/LuaState.cpp | 19 | ||||
| -rw-r--r-- | src/Bindings/LuaState.h | 5 | ||||
| -rw-r--r-- | src/Bindings/PluginLua.cpp | 5 | ||||
| -rw-r--r-- | tests/Generating/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/LoadablePieces/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/LuaThreadStress/CMakeLists.txt | 2 |
12 files changed, 16 insertions, 26 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake index d3a7801ee..869307d91 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -88,6 +88,11 @@ function(set_global_flags) # Make build use Unicode: add_compile_definitions(UNICODE _UNICODE) + + # Turn off CRT warnings: + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) + + return () endif() # Allow for a forced 32-bit build under 64-bit OS: @@ -99,7 +104,7 @@ function(set_global_flags) # https://en.wikipedia.org/wiki/Uname # https://gcc.gnu.org/onlinedocs/gcc/index.html # Have the compiler generate code specifically targeted at the current machine on Linux: - if(UNIX AND NOT NO_NATIVE_OPTIMIZATION AND NOT CMAKE_CROSSCOMPILING) + if(NOT NO_NATIVE_OPTIMIZATION AND NOT CMAKE_CROSSCOMPILING) string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} SYSTEM_PROCESSOR) if (SYSTEM_PROCESSOR MATCHES "^(i386|i686|x86|amd64|mips)") message(STATUS "Optimising for this machine (march=native)") diff --git a/lib/SQLiteCpp b/lib/SQLiteCpp -Subproject a25ffb56ab1bae0f416ac5dfbddd4188ea3c1a9 +Subproject b1f67393fdac05d7d05b7f1232de688e82a7e98 diff --git a/lib/lua b/lib/lua -Subproject 935fe9113295e049baa8ab0163e2dfec0393a8d +Subproject f543fd79318bf31c81141a07662eb71896a1d93 diff --git a/lib/luaexpat b/lib/luaexpat -Subproject 368e2927fcd227bf0af91b3e4b92e740196425c +Subproject d1986776c6c3d209a8410bd5928facf157dc42b diff --git a/lib/sqlite b/lib/sqlite -Subproject 4435d7e4297220228174385302d430f1fdf3d09 +Subproject 9aeab26b00c0bf4c1c3d0afd61acaf08eaf949d diff --git a/lib/tolua++ b/lib/tolua++ -Subproject 4d24aa316898964c23896fbb7419bdaa23638c2 +Subproject 26e85c404baf1d2e5eb4a21660d1f37176d7ab3 diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp index 3a1379df1..e4c537967 100644 --- a/src/Bindings/LuaState.cpp +++ b/src/Bindings/LuaState.cpp @@ -6,10 +6,7 @@ #include "Globals.h" #include "LuaState.h" -extern "C" -{ - #include "lua/src/lualib.h" -} +#include "lua/src/lualib.h" #undef TOLUA_TEMPLATE_BIND #include "tolua++/include/tolua++.h" @@ -34,17 +31,11 @@ extern "C" -// fwd: "SQLite/lsqlite3.c" -extern "C" -{ - int luaopen_lsqlite3(lua_State * L); -} +// fwd: "SQLite/lsqlite3.cpp" +int luaopen_lsqlite3(lua_State * L); -// fwd: "LuaExpat/lxplib.c": -extern "C" -{ - int luaopen_lxp(lua_State * L); -} +// fwd: "LuaExpat/lxplib.cpp": +int luaopen_lxp(lua_State * L); diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h index 420fdad69..d579369f0 100644 --- a/src/Bindings/LuaState.h +++ b/src/Bindings/LuaState.h @@ -30,10 +30,7 @@ stays valid but doesn't call into Lua code anymore, returning false for "failure #pragma once -extern "C" -{ - #include "lua/src/lauxlib.h" -} +#include "lua/src/lauxlib.h" #include "../Defines.h" #include "../FunctionRef.h" diff --git a/src/Bindings/PluginLua.cpp b/src/Bindings/PluginLua.cpp index 9b6bccf7c..887e6d699 100644 --- a/src/Bindings/PluginLua.cpp +++ b/src/Bindings/PluginLua.cpp @@ -18,10 +18,7 @@ #include "../Root.h" #include "../WebAdmin.h" -extern "C" -{ - #include "lua/src/lauxlib.h" -} +#include "lua/src/lauxlib.h" #undef TOLUA_TEMPLATE_BIND #include "tolua++/include/tolua++.h" diff --git a/tests/Generating/CMakeLists.txt b/tests/Generating/CMakeLists.txt index 92307235f..572f2b6d9 100644 --- a/tests/Generating/CMakeLists.txt +++ b/tests/Generating/CMakeLists.txt @@ -161,7 +161,7 @@ add_library(GeneratorTestingSupport STATIC ${GENERATING_HDRS} ${STUBS} ) -target_link_libraries(GeneratorTestingSupport fmt::fmt jsoncpp_static tolualib libdeflate) +target_link_libraries(GeneratorTestingSupport fmt::fmt jsoncpp_static libdeflate lsqlite luaexpat tolualib) source_group("Stubs" FILES ${STUBS}) source_group("Generating" FILES ${GENERATING_HDRS} ${GENERATING_SRCS}) diff --git a/tests/LoadablePieces/CMakeLists.txt b/tests/LoadablePieces/CMakeLists.txt index c09cf8091..4133dea80 100644 --- a/tests/LoadablePieces/CMakeLists.txt +++ b/tests/LoadablePieces/CMakeLists.txt @@ -86,7 +86,7 @@ source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS}) source_group("Sources" FILES ${SRCS}) source_group("Data files" FILES Test.cubeset Test1.schematic) add_executable(LoadablePieces ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS} Test.cubeset Test1.schematic) -target_link_libraries(LoadablePieces tolualib zlib) +target_link_libraries(LoadablePieces libdeflate tolualib) add_test(NAME LoadablePieces-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND LoadablePieces) diff --git a/tests/LuaThreadStress/CMakeLists.txt b/tests/LuaThreadStress/CMakeLists.txt index bd6b40f21..d4a929fdf 100644 --- a/tests/LuaThreadStress/CMakeLists.txt +++ b/tests/LuaThreadStress/CMakeLists.txt @@ -80,7 +80,7 @@ source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS}) source_group("Sources" FILES ${SRCS}) source_group("Lua files" FILES Test.lua) add_executable(LuaThreadStress ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS} Test.lua) -target_link_libraries(LuaThreadStress fmt::fmt Threads::Threads tolualib libdeflate) +target_link_libraries(LuaThreadStress fmt::fmt libdeflate lsqlite luaexpat Threads::Threads tolualib) add_test(NAME LuaThreadStress-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND LuaThreadStress) |