Skip to content

Commit 0ff9ee8

Browse files
committed
lua在webgl上回退回longjmp
1 parent b616438 commit 0ff9ee8

File tree

3 files changed

+0
-23
lines changed

3 files changed

+0
-23
lines changed

unity/native/papi-lua/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,6 @@ add_definitions(-DEASTL_OPENSOURCE=1)
6464
aux_source_directory(${LUA_SRC_PATH} LUA_CORE)
6565
list(REMOVE_ITEM LUA_CORE ${LUA_SRC_PATH}/lua.c ${LUA_SRC_PATH}/luac.c)
6666

67-
# Set .c files to compile as C++ only for WASM/Emscripten platform
68-
if ( CMAKE_SYSTEM_NAME MATCHES "Emscripten" )
69-
foreach(source_file ${LUA_CORE})
70-
if(source_file MATCHES "\\.c$")
71-
set_source_files_properties(${source_file} PROPERTIES LANGUAGE CXX)
72-
endif()
73-
endforeach()
74-
endif()
75-
7667
set(PAPI_SRC
7768
source/PesapiLuaImpl.cpp
7869
source/CppObjectMapperLua.cpp
@@ -135,7 +126,6 @@ target_compile_definitions(PapiLua PUBLIC EA_DEPRECATIONS_FOR_2024_APRIL=EA_DISA
135126
target_compile_definitions(PapiLua PUBLIC EA_DEPRECATIONS_FOR_2024_SEPT=EA_DISABLED)
136127
target_compile_definitions(PapiLua PUBLIC EA_DEPRECATIONS_FOR_2025_APRIL=EA_DISABLED)
137128

138-
if (NOT ( CMAKE_SYSTEM_NAME MATCHES "Emscripten" ))
139129
target_compile_options(PapiLua PRIVATE
140130
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>>>:
141131
-fno-exceptions
@@ -148,4 +138,3 @@ target_compile_options(PapiLua PRIVATE
148138
/GR- # 禁用RTTI
149139
>
150140
)
151-
endif ( )

unity/native/papi-lua/include/CppObjectMapperLua.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
#pragma once
22

33
#include "pesapi.h"
4-
#if defined(__EMSCRIPTEN__)
5-
#include "lua.h"
6-
#include "lualib.h"
7-
#include "lauxlib.h"
8-
#else
94
#include "lua.hpp"
10-
#endif
115
#include <EASTL/unordered_map.h>
126
#include <EASTL/vector.h>
137
#include <EASTL/allocator_malloc.h>

unity/native/papi-lua/include/ObjectCacheNodeLua.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,7 @@
99
#pragma once
1010

1111
#include "NamespaceDef.h"
12-
#if defined(__EMSCRIPTEN__)
13-
#include "lua.h"
14-
#include "lualib.h"
15-
#include "lauxlib.h"
16-
#else
1712
#include "lua.hpp"
18-
#endif
1913
#include <memory>
2014
namespace pesapi
2115
{

0 commit comments

Comments
 (0)