v1.0.16

tangzx · tangzx · commit c37ede5580c7 · 2020-12-22T22:54:06.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,6 +59,8 @@ elseif(${EMMY_LUA_VERSION} STREQUAL "51")
     add_definitions(-DEMMY_LUA_51)
 endif()
 
+add_definitions(-DEMMY_CORE_VERSION="1.0.16")
+
 add_subdirectory(third-party/${EMMY_LUA_DIR})
 add_subdirectory(third-party/libuv-1.29.0)
 add_subdirectory(emmy_core)
diff --git a/emmy_core/api/lua_api_loader.cpp b/emmy_core/api/lua_api_loader.cpp
@@ -382,6 +382,6 @@ extern "C" bool SetupLuaAPI() {
 		LUA_REGISTRYINDEX = -10000;
 		LUA_GLOBALSINDEX = -10002;
 	}
-	printf("[EMMY]lua version: %d\n", luaVersion);
+	printf("[EMMY] version: %s, lua version: %d\n", EMMY_CORE_VERSION, luaVersion);
 	return true;
 }
diff --git a/emmy_core/emmy_core.h b/emmy_core/emmy_core.h
@@ -15,7 +15,7 @@
 */
 #pragma once
 
-#define EMMY_CORE_VERSION "1.0.0"
+//#define EMMY_CORE_VERSION "1.0.0"
 
 #ifdef _MSC_VER
 #define EMMY_CORE_EXPORT    __declspec(dllexport)

Original file line number	Diff line number	Diff line change
`@@ -382,6 +382,6 @@ extern "C" bool SetupLuaAPI() {`
`382`	`382`	`LUA_REGISTRYINDEX = -10000;`
`383`	`383`	`LUA_GLOBALSINDEX = -10002;`
`384`	`384`	`}`
`385`		`- printf("[EMMY]lua version: %d\n", luaVersion);`
	`385`	`+ printf("[EMMY] version: %s, lua version: %d\n", EMMY_CORE_VERSION, luaVersion);`
`386`	`386`	`return true;`
`387`	`387`	`}`