瀏覽代碼

Fix FindUrho3D.cmake module to include back SDL headers as dep.

Install SDL headers for all platforms (not just Android).
Yao Wei Tjong 姚伟忠 12 年之前
父節點
當前提交
a96a94a4f6
共有 2 個文件被更改,包括 4 次插入6 次删除
  1. 1 1
      Source/CMake/Modules/FindUrho3D.cmake
  2. 3 5
      Source/ThirdParty/SDL/CMakeLists.txt

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

@@ -63,7 +63,7 @@ if (URHO3D_HOME)
         foreach (DIR Audio Container Core Engine Graphics Input IO LuaScript Math Navigation Network Physics Resource Scene Script UI)
             list (APPEND URHO3D_INCLUDE_DIR ${SOURCE_TREE_PATH}/${DIR})     # Note: variable change to list context after this
         endforeach ()
-        foreach (DIR Bullet/src kNet/include)
+        foreach (DIR Bullet/src kNet/include SDL/include)
             list (APPEND URHO3D_INCLUDE_DIR ${URHO3D_HOME}/Source/ThirdParty/${DIR})
         endforeach ()
 

+ 3 - 5
Source/ThirdParty/SDL/CMakeLists.txt

@@ -105,11 +105,9 @@ file (GLOB H_FILES include/*.h)
 set_source_files_properties (${C_FILES} PROPERTIES LANGUAGE C)
 set_source_files_properties (${SYS_C_FILES} PROPERTIES LANGUAGE C)
 set (SOURCE_FILES ${C_FILES} ${SYS_C_FILES} ${H_FILES})
-if (ANDROID)
-    # Install dependency for SDL_android_main.c
-    install (DIRECTORY include/ DESTINATION ${DEST_INCLUDE_DIR}/SDL USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN *.h)     # Note: the trailing slash is significant
-    install (FILES src/main/android/SDL_android_main.c DESTINATION ${DEST_RUNTIME_DIR}/../templates/android)
-endif ()
+# Install dependency for SDL_android_main.c, D3D9GraphicsImpl.h, OGLGraphicsImpl.h, InputEvents.h, File.h, and Cursor.h
+install (DIRECTORY include/ DESTINATION ${DEST_INCLUDE_DIR}/SDL USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN *.h)     # Note: the trailing slash is significant
+install (FILES src/main/android/SDL_android_main.c DESTINATION ${DEST_RUNTIME_DIR}/../templates/android)
 
 # Setup target
 setup_library ()