Kaynağa Gözat

Make it more bullet-proof to copy paste error by new user.
The project name 'Urho3D' is reserved just for Urho3D project.

Yao Wei Tjong 姚伟忠 10 yıl önce
ebeveyn
işleme
17f6bc5ff8

+ 1 - 1
Source/Urho3D/CMakeLists.txt

@@ -68,7 +68,7 @@ if (URHO3D_LUA)
         list (APPEND GEN_CPP_FILES ${GEN_CPP_FILE})
         list (APPEND GEN_CPP_FILES ${GEN_CPP_FILE})
         file (GLOB PKG_FILES LuaScript/pkgs/${DIR}/*.pkg)
         file (GLOB PKG_FILES LuaScript/pkgs/${DIR}/*.pkg)
         add_custom_command (OUTPUT ${GEN_CPP_FILE}
         add_custom_command (OUTPUT ${GEN_CPP_FILE}
-            COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -E IS_BUILDING_URHO3D -L ToCppHook.lua -o ${CMAKE_CURRENT_BINARY_DIR}/${GEN_CPP_FILE} ${NAME}
+            COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -E ${CMAKE_PROJECT_NAME} -L ToCppHook.lua -o ${CMAKE_CURRENT_BINARY_DIR}/${GEN_CPP_FILE} ${NAME}
             DEPENDS tolua++ ${API_PKG_FILE} ${PKG_FILES} LuaScript/pkgs/ToCppHook.lua
             DEPENDS tolua++ ${API_PKG_FILE} ${PKG_FILES} LuaScript/pkgs/ToCppHook.lua
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/LuaScript/pkgs
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/LuaScript/pkgs
             COMMENT "Generating tolua++ API binding on the fly for ${DIR}")
             COMMENT "Generating tolua++ API binding on the fly for ${DIR}")

+ 1 - 1
Source/Urho3D/LuaScript/pkgs/ToCppHook.lua

@@ -96,7 +96,7 @@ function post_output_hook(package)
 #pragma clang diagnostic push
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-function"
 #pragma clang diagnostic ignored "-Wunused-function"
 #endif]])
 #endif]])
-    if _extra_parameters["IS_BUILDING_URHO3D"] then
+    if _extra_parameters["Urho3D"] then
         replace([[<Urho3D/LuaScript/ToluaUtils.h>]], [["LuaScript/ToluaUtils.h"]])
         replace([[<Urho3D/LuaScript/ToluaUtils.h>]], [["LuaScript/ToluaUtils.h"]])
     end
     end