Browse Source

Simplify the conditional branch to find the SDL_android_main.c.

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
63a1531076
1 changed files with 3 additions and 4 deletions
  1. 3 4
      Source/CMake/Modules/Urho3D-CMake-common.cmake

+ 3 - 4
Source/CMake/Modules/Urho3D-CMake-common.cmake

@@ -512,11 +512,10 @@ macro (add_android_native_init)
     # This source file could not be added when building SDL static library because it needs SDL_Main() which is not yet available at library building time
     # This source file could not be added when building SDL static library because it needs SDL_Main() which is not yet available at library building time
     # 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
     # 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 (URHO3D_HOME)
     if (URHO3D_HOME)
-        # First attempt to search using project source directory
+        # Search using project source directory which for sure is not rooted
         find_file (ANDROID_MAIN_C_PATH SDL_android_main.c PATHS ${URHO3D_HOME}/Source/ThirdParty/SDL/src/main/android DOC "Path to SDL_android_main.c" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
         find_file (ANDROID_MAIN_C_PATH SDL_android_main.c PATHS ${URHO3D_HOME}/Source/ThirdParty/SDL/src/main/android DOC "Path to SDL_android_main.c" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-    endif ()
-    if (NOT ANDROID_MAIN_C_PATH)
-        # Attempt another search using Urho3D SDK installation location which could be rooted
+    else ()
+        # Search using Urho3D SDK installation location which could be rooted
         find_file (ANDROID_MAIN_C_PATH SDL_android_main.c PATH_SUFFIXES ${PATH_SUFFIX} DOC "Path to SDL_android_main.c")
         find_file (ANDROID_MAIN_C_PATH SDL_android_main.c PATH_SUFFIXES ${PATH_SUFFIX} DOC "Path to SDL_android_main.c")
     endif ()
     endif ()
     if (ANDROID_MAIN_C_PATH)
     if (ANDROID_MAIN_C_PATH)