From c37ede5580c7b5654feb735c73659ba99bf9d792 Mon Sep 17 00:00:00 2001 From: tangzx Date: Tue, 22 Dec 2020 22:54:06 +0800 Subject: [PATCH] v1.0.16 --- CMakeLists.txt | 2 ++ emmy_core/api/lua_api_loader.cpp | 2 +- emmy_core/emmy_core.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c4d3c7..94da049 100644 --- 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 index 8ce1d9b..aec9421 100644 --- 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 index 3763015..118957d 100644 --- 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)