mirror of
https://github.com/ThePhD/sol2.git
synced 2024-03-22 13:10:44 +08:00
Update single, make sure warnings are not there.
This commit is contained in:
ThePhD
parent
4aac17c602
commit
52ec50010b
|
|
@ -126,7 +126,7 @@ init:
|
|||
- set parallelism=
|
||||
- set logger=
|
||||
- set build_compiler=
|
||||
- set lua_build_type=OFF
|
||||
- set lua_build_type=ON
|
||||
- set vcvars_script="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
|
||||
- if "%PLATFORM%"=="x64" (set arch= Win64)
|
||||
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (set CMAKE_GENERATOR=Visual Studio 15 2017%arch%&&set parallelism=/maxcpucount&&set logger=/verbosity:quiet /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"&&set vcvars_script="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat")
|
||||
|
|
|
|||
|
|
@ -165,11 +165,40 @@ set(LUA_JIT_EXE_FILE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${LUA_JIT_EXE_FILENAME}"
|
|||
if (MSVC)
|
||||
# Visual C++ is predicated off running msvcbuild.bat
|
||||
# which requires a Visual Studio Command Prompt
|
||||
if (BUILD_LUA_AS_DLL)
|
||||
set(LUA_JIT_MAKE_COMMAND cd src && msvcbuild.bat)
|
||||
else()
|
||||
set(LUA_JIT_MAKE_COMMAND cd src && msvcbuild.bat static)
|
||||
# make sure to find the right one
|
||||
find_file(VCVARS_ALL_BAT NAMES vcvarsall.bat
|
||||
HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary"
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC"
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary"
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC"
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary"
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC"
|
||||
|
||||
"C:/Program Files/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
|
||||
"C:/Program Files/Microsoft Visual Studio/2017/Community/VC/Auxiliary"
|
||||
"C:/Program Files/Microsoft Visual Studio/2017/Community/VC"
|
||||
"C:/Program Files/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
|
||||
"C:/Program Files/Microsoft Visual Studio/2017/Professional/VC/Auxiliary"
|
||||
"C:/Program Files/Microsoft Visual Studio/2017/Professional/VC"
|
||||
"C:/Program Files/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
|
||||
"C:/Program Files/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary"
|
||||
"C:/Program Files/Microsoft Visual Studio/2017/Enterprise/VC")
|
||||
if (VCVARS_ALL_BAT MATCHES "VCVARS_ALL_BAT-NOTFOUND")
|
||||
MESSAGE(FATAL_ERROR "Cannot find 'vcvarsall.bat' file or similar needed to build LuaJIT ${LUA_VERSION} on Windows")
|
||||
endif()
|
||||
if (CMAKE_SIZEOF_VOID_P LESS_EQUAL 4)
|
||||
set(LUA_JIT_MAKE_COMMAND "${VCVARS_ALL_BAT}" x86)
|
||||
else()
|
||||
set(LUA_JIT_MAKE_COMMAND "${VCVARS_ALL_BAT}" x64)
|
||||
endif()
|
||||
set(LUA_JIT_MAKE_COMMAND ${LUA_JIT_MAKE_COMMAND} && cd src && msvcbuild.bat)
|
||||
if (NOT BUILD_LUA_AS_DLL)
|
||||
set(LUA_JIT_MAKE_COMMAND ${LUA_JIT_MAKE_COMMAND} static)
|
||||
endif()
|
||||
|
||||
set(LUA_JIT_PREBUILT_LIB "lua51.lib")
|
||||
set(LUA_JIT_PREBUILT_IMP_LIB "lua51.lib")
|
||||
set(LUA_JIT_PREBUILT_DLL "lua51.dll")
|
||||
|
|
|
|||
|
|
@ -413,7 +413,7 @@ COMPAT53_API void luaL_requiref(lua_State *L, const char *modname,
|
|||
|
||||
|
||||
#if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE == 1
|
||||
# include "compat-5.3.c"
|
||||
# include "compat-5.3.c.h"
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,16 @@
|
|||
#define SOL_EXCEPTIONS_SAFE_PROPAGATION 1
|
||||
#endif // Exceptions can be propagated safely using C++-compiled Lua
|
||||
#else
|
||||
#if defined(SOL_NO_LUA_HPP) && SOL_NO_LUA_HPP
|
||||
extern "C" {
|
||||
#include <lua.h>
|
||||
#include <lauxlib.h>
|
||||
#include <lualib.h>
|
||||
#if defined(LUAJIT_VERSION) && LUAJIT_VERSION
|
||||
#include <luajit.h>
|
||||
#endif
|
||||
}
|
||||
#else
|
||||
#if defined(__has_include)
|
||||
#if __has_include(<lua.hpp>)
|
||||
#include <lua.hpp>
|
||||
|
|
@ -45,7 +55,7 @@
|
|||
#include <lua.h>
|
||||
#include <lauxlib.h>
|
||||
#include <lualib.h>
|
||||
#if defined(SOL_LUAJIT) && SOL_LUAJIT
|
||||
#if defined(LUAJIT_VERSION) && LUAJIT_VERSION
|
||||
#include <luajit.h>
|
||||
#endif
|
||||
}
|
||||
|
|
@ -53,6 +63,7 @@
|
|||
#else
|
||||
#include <lua.hpp>
|
||||
#endif // check for lua.hpp safely for Lua 5.1 derps
|
||||
#endif // Manual - have lua.hpp or not
|
||||
#endif // C++ Mangling for Lua vs. Not
|
||||
|
||||
#ifdef LUAJIT_VERSION
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
#if defined(__GNUC__)
|
||||
#pragma GCC diagnostic pop
|
||||
#elif defined _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(pop)
|
||||
#endif // g++
|
||||
|
||||
#if defined(SOL_INSIDE_UNREAL)
|
||||
|
|
|
|||
|
|
@ -90,7 +90,6 @@ namespace sol {
|
|||
#if SOL_LUA_VERSION < 502
|
||||
// Use lua_getfenv
|
||||
lua_getfenv(L, index);
|
||||
return 1;
|
||||
#else
|
||||
// Use upvalues as explained in Lua 5.2 and beyond's manual
|
||||
if (lua_getupvalue(L, index, 1) == nullptr) {
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
// This file was generated with a script.
|
||||
// Generated 2019-03-23 18:56:05.873126 UTC
|
||||
// This header was generated with sol v3.0.1-beta (revision 9a0a27a)
|
||||
// Generated 2019-03-24 01:49:03.673540 UTC
|
||||
// This header was generated with sol v3.0.0-beta (revision 4aac17c)
|
||||
// https://github.com/ThePhD/sol2
|
||||
|
||||
#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
// This file was generated with a script.
|
||||
// Generated 2019-03-23 18:56:05.596914 UTC
|
||||
// This header was generated with sol v3.0.1-beta (revision 9a0a27a)
|
||||
// Generated 2019-03-24 01:49:03.378490 UTC
|
||||
// This header was generated with sol v3.0.0-beta (revision 4aac17c)
|
||||
// https://github.com/ThePhD/sol2
|
||||
|
||||
#ifndef SOL_SINGLE_INCLUDE_HPP
|
||||
|
|
@ -2072,17 +2072,24 @@ namespace sol {
|
|||
#define SOL_EXCEPTIONS_SAFE_PROPAGATION 1
|
||||
#endif // Exceptions can be propagated safely using C++-compiled Lua
|
||||
#else
|
||||
#if defined(SOL_NO_LUA_HPP) && SOL_NO_LUA_HPP
|
||||
extern "C" {
|
||||
#if defined(LUAJIT_VERSION) && LUAJIT_VERSION
|
||||
#endif
|
||||
}
|
||||
#else
|
||||
#if defined(__has_include)
|
||||
#if __has_include(<lua.hpp>)
|
||||
#include <lua.hpp>
|
||||
#else
|
||||
extern "C" {
|
||||
#if defined(SOL_LUAJIT) && SOL_LUAJIT
|
||||
#if defined(LUAJIT_VERSION) && LUAJIT_VERSION
|
||||
#endif
|
||||
}
|
||||
#endif // lua.hpp exists or does not
|
||||
#else
|
||||
#endif // check for lua.hpp safely for Lua 5.1 derps
|
||||
#endif // Manual - have lua.hpp or not
|
||||
#endif // C++ Mangling for Lua vs. Not
|
||||
|
||||
#ifdef LUAJIT_VERSION
|
||||
|
|
@ -2528,7 +2535,7 @@ COMPAT53_API void luaL_requiref(lua_State *L, const char *modname,
|
|||
#endif
|
||||
|
||||
#if defined(COMPAT53_INCLUDE_SOURCE) && COMPAT53_INCLUDE_SOURCE == 1
|
||||
// beginning of sol/compatibility/compat-5.3.c
|
||||
// beginning of sol/compatibility/compat-5.3.c.h
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
|
|
@ -3364,7 +3371,7 @@ COMPAT53_API void luaL_requiref(lua_State *L, const char *modname,
|
|||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*********************************************************************/
|
||||
|
||||
// end of sol/compatibility/compat-5.3.c
|
||||
// end of sol/compatibility/compat-5.3.c.h
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -12673,7 +12680,6 @@ namespace sol {
|
|||
#if SOL_LUA_VERSION < 502
|
||||
// Use lua_getfenv
|
||||
lua_getfenv(L, index);
|
||||
return 1;
|
||||
#else
|
||||
// Use upvalues as explained in Lua 5.2 and beyond's manual
|
||||
if (lua_getupvalue(L, index, 1) == nullptr) {
|
||||
|
|
@ -24964,7 +24970,7 @@ namespace sol {
|
|||
#if defined(__GNUC__)
|
||||
#pragma GCC diagnostic pop
|
||||
#elif defined _MSC_VER
|
||||
#pragma warning(push)
|
||||
#pragma warning(pop)
|
||||
#endif // g++
|
||||
|
||||
#if defined(SOL_INSIDE_UNREAL)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user