iOS: fix build

zhongfq · May 8, 2023 · 152a83a · 152a83a
1 parent cb333b0
commit 152a83a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/frameworks/3rd/lua/CMakeLists.txt b/frameworks/3rd/lua/CMakeLists.txt
@@ -82,6 +82,8 @@ if(WINDOWS)
   target_compile_definitions(lua PRIVATE LUA_BUILD_AS_DLL)
 elseif(MACOSX)
   target_compile_definitions(lua PUBLIC LUA_USE_MACOSX)
+elseif(IOS)
+  target_compile_definitions(lua PUBLIC LUA_USE_IOS)
 endif()
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${LUA_SRC})
diff --git a/frameworks/cclua/src/cclua/olua-2dx.cpp b/frameworks/cclua/src/cclua/olua-2dx.cpp
@@ -24,27 +24,10 @@ extern bool olua_throw_error(const char *msg)
 }
 OLUA_END_DECLS
 
-#if COCOS2D_VERSION < 0x00040000 && defined(CCLUA_OS_WIN32)
-#include "base/CCScriptSupport.h"
-class AssertEngine : public ScriptEngineProtocol {
-public:
-    virtual int executeString(const char* codes) { return 0; }
-    virtual int executeScriptFile(const char* filename) { return 0; }
-    virtual int executeGlobalFunction(const char* functionName) { return 0; }
-    virtual int sendEvent(ScriptEvent* evt) { return 0; }
-    virtual bool parseConfig(ConfigType type, const std::string& str) { return true; }
-
-    virtual bool handleAssert(const char *msg)
-    {
-        return throw_lua_error(msg);
-    }
-};
-#else
 extern bool cc_assert_script_compatible(const char *msg)
 {
     return olua_throw_error(msg);
 }
-#endif
 
 static int _coroutine_resume(lua_State *L)
 {
@@ -334,12 +317,6 @@ lua_State *cclua_new()
 
     lua_pushboolean(L, runtime::isDebug());
     lua_setglobal(L, "DEBUG");
-
-#if COCOS2D_VERSION < 0x00040000
-#ifdef CCLUA_OS_WIN32
-	ScriptEngineManager::getInstance()->setScriptEngine(new AssertEngine());
-#endif
-#endif
 
     return L;
 }