修正依赖关系

Author: CppCXY

CMakeLists.txt

@@ -26,7 +26,7 @@ elseif(${EMMY_LUA_VERSION} STREQUAL "jit")
     #add_definitions(-DEMMY_LUA_JIT_SUPPORT_LUA_SETFUNCS)
 endif()
 
-add_definitions(-DEMMY_CORE_VERSION="1.4.2")
+add_definitions(-DEMMY_CORE_VERSION="1.5.2")
 
 if(EMMY_USE_LUA_SOURCE)
     add_definitions(-DEMMY_USE_LUA_SOURCE)

emmy_debugger/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.11)
 
 project (emmy_debugger)
 
-add_library(emmy_debugger STATIC )
+add_library(emmy_debugger STATIC)
 
 add_dependencies(
     emmy_debugger
@@ -69,9 +69,10 @@ if(EMMY_USE_LUA_SOURCE)
             ${emmy_debugger_SOURCE_DIR}/src/api/lua_state/lua_state_jit.cpp
         )
     else()
+        add_dependencies(emmy_debugger lua${EMMY_LUA_VERSION})
         target_link_libraries(
             emmy_debugger
-            PRIVATE lua${EMMY_LUA_VERSION}
+            PUBLIC lua${EMMY_LUA_VERSION}
         )
         target_sources(emmy_debugger
             PRIVATE

emmy_debugger/src/api/lua_api.cpp

@@ -16,7 +16,7 @@
 
 
 
-
+#ifdef EMMY_USE_LUA_SOURCE
 #if  defined(EMMY_LUA_51) || defined(EMMY_LUA_JIT)
 #include "emmy_debugger/api/lua_api.h"
 int lua_absindex(lua_State *L, int idx) {
@@ -42,3 +42,4 @@ void lua_pushglobaltable(lua_State* L)
 }
 
 #endif
+#endif

emmy_debugger/src/emmy_debugger.cpp

@@ -311,7 +311,7 @@ std::string ToPointer(lua_State* L, int index)
 	return ss.str();
 }
 
-
+#ifndef EMMY_USE_LUA_SOURCE
 void DisplayFunction54(std::shared_ptr<Variable> variable, lua_State* L, int index, lua_Debug_54& ar)
 {
 	if (ar.what == nullptr)
@@ -398,7 +398,7 @@ void DisplayFunction(std::shared_ptr<Variable> variable, lua_State* L, int index
 	}
 	lua_settop(L, index);
 }
-
+#endif
 // algorithm optimization
 void Debugger::GetVariable(lua_State* L, std::shared_ptr<Variable> variable, int index, int depth, bool queryHelper)
 {
@@ -492,7 +492,12 @@ void Debugger::GetVariable(lua_State* L, std::shared_ptr<Variable> variable, int
 		}
 	case LUA_TFUNCTION:
 		{
+#ifndef EMMY_USE_LUA_SOURCE
 			DisplayFunction(variable, L, index);
+#else
+			variable->value = ToPointer(L, index);
+#endif
+
 			break;
 		}
 	case LUA_TLIGHTUSERDATA:

emmy_debugger/src/emmy_debugger_lib.cpp

@@ -13,8 +13,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+#include "emmy_debugger/emmy_debugger_lib.h"
 #include <cstring>
-#include "emmy_debugger/types.h"
 #include "emmy_debugger/emmy_debugger.h"
 #include "emmy_debugger/emmy_facade.h"
 

include/emmy_debugger/api/lua_api_loader.h

@@ -24,7 +24,7 @@ typedef double lua_Number;
 typedef long long lua_Integer;
 typedef ptrdiff_t lua_KContext;
 
-#include "emmy_debugger/api/lua_state.h"
+#include "lua_state.h"
 
 /*
 @@ LUA_IDSIZE gives the maximum size for the description of the source