浏览代码

Rename Urho3D script host app from "Urho3D" to "Urho3DPlayer".

Yao Wei Tjong 姚伟忠 12 年之前
父节点
当前提交
c1480abfb8

+ 2 - 2
Source/CMake/Modules/FindUrho3D.cmake

@@ -77,8 +77,8 @@ if (URHO3D_HOME)
             list (APPEND URHO3D_INCLUDE_DIR ${URHO3D_HOME}/Build/Engine)
             set (URHO3D_LIB_SEARCH_PATH ${URHO3D_HOME}/Lib)
         endif ()
-        if (TARGET Urho3D_lib)
-            set (URHO3D_LIBRARIES Urho3D_lib)
+        if (TARGET Urho3D)
+            set (URHO3D_LIBRARIES Urho3D)
             set (FOUND_MESSAGE "Found Urho3D: as CMake target")
         else ()
             find_library (URHO3D_LIBRARIES NAMES ${URHO3D_LIB_NAMES} PATHS ${URHO3D_LIB_SEARCH_PATH} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)

+ 8 - 12
Source/CMake/Modules/Urho3D-CMake-magic.cmake

@@ -365,7 +365,7 @@ endmacro ()
 # Macro for setting up an executable target
 macro (setup_executable)
     add_executable (${TARGET_NAME} ${ARGN} ${SOURCE_FILES})
-    define_dependency_libs (Urho3D_lib)
+    define_dependency_libs (Urho3D)
     setup_target ()
     
     if (IOS)
@@ -403,10 +403,6 @@ macro (add_android_native_init)
     # The SDL_Main() is defined by Android application that could be resided in other CMake projects outside of Urho3D CMake project which makes things a little bit complicated
     if (CMAKE_PROJECT_NAME MATCHES Urho3D.*)
         list (APPEND SOURCE_FILES ${PROJECT_ROOT_DIR}/Source/ThirdParty/SDL/src/main/android/SDL_android_main.c)
-        # Rename target name to avoid name clash with Urho3D game engine shared library
-        if (TARGET_NAME STREQUAL Urho3D AND URHO3D_LIB_TYPE STREQUAL SHARED)
-            set (TARGET_NAME Urho3Dapp)
-        endif ()
     elseif (EXISTS $ENV{URHO3D_HOME}/Source/ThirdParty/SDL/src/main/android/SDL_android_main.c)
         # Use Urho3D source installation
         list (APPEND SOURCE_FILES $ENV{URHO3D_HOME}/Source/ThirdParty/SDL/src/main/android/SDL_android_main.c)
@@ -439,7 +435,7 @@ macro (setup_main_executable)
         # Setup shared library output path
         set_output_directories (${ANDROID_LIBRARY_OUTPUT_PATH} LIBRARY)
         # Setup target as main shared library
-        define_dependency_libs (Urho3D_lib)
+        define_dependency_libs (Urho3D)
         setup_library (SHARED)
         # Copy other dependent shared libraries to Android library output path
         foreach(FILE ${ABSOLUTE_PATH_LIBS})
@@ -490,7 +486,7 @@ endmacro ()
 # It works for both targets setup within Urho3D project and outside Urho3D project that uses Urho3D as external static/shared library
 macro (define_dependency_libs TARGET)
     # ThirdParty/SDL external dependency
-    if (${TARGET} MATCHES SDL|Urho3D_lib)
+    if (${TARGET} MATCHES SDL|Urho3D)
         if (WIN32)
             list (APPEND LINK_LIBS_ONLY user32 gdi32 winmm imm32 ole32 oleaut32 version uuid)
         elseif (APPLE)
@@ -507,7 +503,7 @@ macro (define_dependency_libs TARGET)
     endif ()
 
     # ThirdParty/kNet & ThirdParty/Civetweb external dependency
-    if (${TARGET} MATCHES Civetweb|kNet|Urho3D_lib)
+    if (${TARGET} MATCHES Civetweb|kNet|Urho3D)
         if (WIN32)
             list (APPEND LINK_LIBS_ONLY ws2_32)
         elseif (NOT ANDROID)
@@ -516,7 +512,7 @@ macro (define_dependency_libs TARGET)
     endif ()
 
     # Engine/LuaJIT external dependency
-    if (ENABLE_LUAJIT AND ${TARGET} MATCHES LuaJIT|Urho3D_lib)
+    if (ENABLE_LUAJIT AND ${TARGET} MATCHES LuaJIT|Urho3D)
         if (NOT WIN32)
             list (APPEND LINK_LIBS_ONLY dl m)
             if (NOT APPLE)
@@ -526,7 +522,7 @@ macro (define_dependency_libs TARGET)
     endif ()
 
     # Engine external dependency
-    if (${TARGET} STREQUAL Urho3D_lib)
+    if (${TARGET} STREQUAL Urho3D)
         # Core
         if (WIN32)
             list (APPEND LINK_LIBS_ONLY winmm)
@@ -550,8 +546,8 @@ macro (define_dependency_libs TARGET)
             list (APPEND ABSOLUTE_PATH_LIBS ${DIRECT3D_LIBRARY})
         endif ()
 
-        # This variable value can either be 'Urho3D_lib' target or an absolute path to an actual static/shared Urho3D library
-        # The former would cause CMake not only to link against the Urho3D library but also to add a dependency to Urho3D_lib target
+        # This variable value can either be 'Urho3D' target or an absolute path to an actual static/shared Urho3D library
+        # The former would cause CMake not only to link against the Urho3D library but also to add a dependency to Urho3D target
         if (URHO3D_LIBRARIES)
             list (APPEND ABSOLUTE_PATH_LIBS ${URHO3D_LIBRARIES})
         endif ()

+ 2 - 3
Source/Engine/CMakeLists.txt

@@ -21,7 +21,7 @@
 #
 
 # Define target name
-set (TARGET_NAME Urho3D_lib)
+set (TARGET_NAME Urho3D)
 
 # Define generated source files
 execute_process (COMMAND git describe --always WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE GIT_EXIT_CODE OUTPUT_QUIET ERROR_QUIET)
@@ -130,7 +130,6 @@ set_output_directories (${OUTPUT_PATH} ARCHIVE LIBRARY)
  
 # Setup target
 setup_library (${URHO3D_LIB_TYPE})
-adjust_library_name ()
 install (TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${DEST_RUNTIME_DIR} LIBRARY DESTINATION ${DEST_LIBRARY_DIR} ARCHIVE DESTINATION ${DEST_ARCHIVE_DIR})
 if (NOT GIT_EXIT_CODE EQUAL 0)
     add_dependencies (${TARGET_NAME} ${STATIC_LIBRARY_TARGETS})
@@ -149,7 +148,7 @@ endif ()
 # Generate platform specific export header file automatically
 if (NOT URHO3D_LIB_TYPE STREQUAL URHO3D_EXPORTS_LIB_TYPE OR ${CMAKE_CURRENT_SOURCE_DIR}/Urho3D.h.in IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/Urho3D.h)
     set_target_properties (${TARGET_NAME} PROPERTIES DEFINE_SYMBOL URHO3D_EXPORTS)
-    generate_export_header (${TARGET_NAME} BASE_NAME ${LIB_NAME} EXPORT_MACRO_NAME URHO3D_API EXPORT_FILE_NAME Urho3D.h)
+    generate_export_header (${TARGET_NAME} EXPORT_MACRO_NAME URHO3D_API EXPORT_FILE_NAME Urho3D.h)
     set (URHO3D_EXPORTS_LIB_TYPE ${URHO3D_LIB_TYPE} CACHE INTERNAL "Lib type when Urho3D export header was last generated")
     
     # Append Urho3D license notice to the export header file

+ 2 - 2
Source/Tools/CMakeLists.txt

@@ -27,8 +27,8 @@ project (Urho3D-Tools)
 find_package (Urho3D REQUIRED)
 include_directories (${URHO3D_INCLUDE_DIR})
 
-# Urho3D script host application
-add_subdirectory (Urho3D)
+# Urho3DPlayer application
+add_subdirectory (Urho3DPlayer)
 
 # Do not build tools for Raspberry Pi unless it is explicitly enabled
 if (NOT DEFINED ENABLE_TOOLS)

+ 1 - 1
Source/Tools/Urho3D/CMakeLists.txt → Source/Tools/Urho3DPlayer/CMakeLists.txt

@@ -21,7 +21,7 @@
 #
 
 # Define target name
-set (TARGET_NAME Urho3D)
+set (TARGET_NAME Urho3DPlayer)
 
 # Define source files
 define_source_files ()

+ 22 - 22
Source/Tools/Urho3D/Urho3D.cpp → Source/Tools/Urho3DPlayer/Urho3DPlayer.cpp

@@ -39,22 +39,22 @@
 
 using namespace Urho3D;
 
-/// Urho3D script host application, which runs a script specified on the command line.
-class Urho : public Application
+/// Urho3DPlayer application runs a script specified on the command line.
+class Urho3DPlayer : public Application
 {
-    OBJECT(Urho3D);
-    
+    OBJECT(Urho3DPlayer);
+
 public:
     /// Construct.
-    Urho(Context* context);
-    
+    Urho3DPlayer(Context* context);
+
     /// Setup before engine initialization. Verify that a script file has been specified.
     virtual void Setup();
     /// Setup after engine initialization. Load the script and execute its start function.
     virtual void Start();
     /// Cleanup after the main loop. Run the script's stop function if it exists.
     virtual void Stop();
-    
+
 private:
     /// Handle reload start of the script file.
     void HandleScriptReloadStarted(StringHash eventType, VariantMap& eventData);
@@ -62,21 +62,21 @@ private:
     void HandleScriptReloadFinished(StringHash eventType, VariantMap& eventData);
     /// Handle reload failure of the script file.
     void HandleScriptReloadFailed(StringHash eventType, VariantMap& eventData);
-    
+
     /// Script file name.
     String scriptFileName_;
     /// Script file.
     SharedPtr<ScriptFile> scriptFile_;
 };
 
-DEFINE_APPLICATION_MAIN(Urho);
+DEFINE_APPLICATION_MAIN(Urho3DPlayer);
 
-Urho::Urho(Context* context) :
+Urho3DPlayer::Urho3DPlayer(Context* context) :
     Application(context)
 {
 }
 
-void Urho::Setup()
+void Urho3DPlayer::Setup()
 {
     // On Android and iOS, read command line from a file as parameters can not otherwise be easily given
     #if defined(ANDROID) || defined(IOS)
@@ -86,7 +86,7 @@ void Urho::Setup()
     ParseArguments(commandLine, false);
     commandFile->Close();
     #endif
-    
+
     // Check for script file name
     const Vector<String>& arguments = GetArguments();
     String scriptFileName;
@@ -98,11 +98,11 @@ void Urho::Setup()
             break;
         }
     }
-    
+
     // Show usage if not found
     if (scriptFileName_.Empty())
     {
-        ErrorExit("Usage: Urho3D <scriptfile> [options]\n\n"
+        ErrorExit("Usage: Urho3DPlayer <scriptfile> [options]\n\n"
             "The script file should implement the function void Start() for initializing the "
             "application and subscribing to all necessary events, such as the frame update.\n"
             #ifndef WIN32
@@ -134,7 +134,7 @@ void Urho::Setup()
     }
 }
 
-void Urho::Start()
+void Urho3DPlayer::Start()
 {
 #ifdef ENABLE_LUA
     String extension = GetExtension(scriptFileName_);
@@ -151,9 +151,9 @@ void Urho::Start()
         if (scriptFile_ && scriptFile_->Execute("void Start()"))
         {
             // Subscribe to script's reload event to allow live-reload of the application
-            SubscribeToEvent(scriptFile_, E_RELOADSTARTED, HANDLER(Urho, HandleScriptReloadStarted));
-            SubscribeToEvent(scriptFile_, E_RELOADFINISHED, HANDLER(Urho, HandleScriptReloadFinished));
-            SubscribeToEvent(scriptFile_, E_RELOADFAILED, HANDLER(Urho, HandleScriptReloadFailed));
+            SubscribeToEvent(scriptFile_, E_RELOADSTARTED, HANDLER(Urho3DPlayer, HandleScriptReloadStarted));
+            SubscribeToEvent(scriptFile_, E_RELOADFINISHED, HANDLER(Urho3DPlayer, HandleScriptReloadFinished));
+            SubscribeToEvent(scriptFile_, E_RELOADFAILED, HANDLER(Urho3DPlayer, HandleScriptReloadFailed));
             return;
         }
 #ifdef ENABLE_LUA
@@ -177,7 +177,7 @@ void Urho::Start()
     ErrorExit();
 }
 
-void Urho::Stop()
+void Urho3DPlayer::Stop()
 {
     if (scriptFile_)
     {
@@ -195,13 +195,13 @@ void Urho::Stop()
 #endif
 }
 
-void Urho::HandleScriptReloadStarted(StringHash eventType, VariantMap& eventData)
+void Urho3DPlayer::HandleScriptReloadStarted(StringHash eventType, VariantMap& eventData)
 {
     if (scriptFile_->GetFunction("void Stop()"))
         scriptFile_->Execute("void Stop()");
 }
 
-void Urho::HandleScriptReloadFinished(StringHash eventType, VariantMap& eventData)
+void Urho3DPlayer::HandleScriptReloadFinished(StringHash eventType, VariantMap& eventData)
 {
     // Restart the script application after reload
     if (!scriptFile_->Execute("void Start()"))
@@ -211,7 +211,7 @@ void Urho::HandleScriptReloadFinished(StringHash eventType, VariantMap& eventDat
     }
 }
 
-void Urho::HandleScriptReloadFailed(StringHash eventType, VariantMap& eventData)
+void Urho3DPlayer::HandleScriptReloadFailed(StringHash eventType, VariantMap& eventData)
 {
     scriptFile_.Reset();
     ErrorExit();