Browse Source

In order to move the out-of-source 'build' directory back to Urho3D project root directory, all the source codes sub-directories are now moved down one level to a new directory under project root called 'Source'.

Wei Tjong Yao 12 years ago
parent
commit
02512cecf9
100 changed files with 22 additions and 2 deletions
  1. 0 0
      Bin/01_LuaHelloWorld.sh
  2. 0 0
      Source/Android/AndroidManifest.xml
  3. 0 0
      Source/Android/CopyData.bat
  4. 0 0
      Source/Android/build.xml
  5. 1 1
      Source/Android/project.properties
  6. 0 0
      Source/Android/res/drawable-hdpi/icon.png
  7. 0 0
      Source/Android/res/drawable-ldpi/icon.png
  8. 0 0
      Source/Android/res/drawable-mdpi/icon.png
  9. 0 0
      Source/Android/res/layout/main.xml
  10. 0 0
      Source/Android/res/values/strings.xml
  11. 0 0
      Source/Android/src/com/googlecode/urho3d/Urho3D.java
  12. 0 0
      Source/Android/src/org/libsdl/app/SDLActivity.java
  13. 0 0
      Source/CMakeLists.txt
  14. 0 0
      Source/Engine/Audio/Audio.cpp
  15. 0 0
      Source/Engine/Audio/Audio.h
  16. 0 0
      Source/Engine/Audio/AudioDefs.h
  17. 0 0
      Source/Engine/Audio/CMakeLists.txt
  18. 0 0
      Source/Engine/Audio/Precompiled.cpp
  19. 0 0
      Source/Engine/Audio/Precompiled.h
  20. 0 0
      Source/Engine/Audio/Sound.cpp
  21. 0 0
      Source/Engine/Audio/Sound.h
  22. 0 0
      Source/Engine/Audio/SoundListener.cpp
  23. 0 0
      Source/Engine/Audio/SoundListener.h
  24. 0 0
      Source/Engine/Audio/SoundSource.cpp
  25. 0 0
      Source/Engine/Audio/SoundSource.h
  26. 0 0
      Source/Engine/Audio/SoundSource3D.cpp
  27. 0 0
      Source/Engine/Audio/SoundSource3D.h
  28. 21 1
      Source/Engine/CMakeLists.txt
  29. 0 0
      Source/Engine/Container/Allocator.cpp
  30. 0 0
      Source/Engine/Container/Allocator.h
  31. 0 0
      Source/Engine/Container/ArrayPtr.h
  32. 0 0
      Source/Engine/Container/CMakeLists.txt
  33. 0 0
      Source/Engine/Container/DebugNew.h
  34. 0 0
      Source/Engine/Container/ForEach.h
  35. 0 0
      Source/Engine/Container/Hash.h
  36. 0 0
      Source/Engine/Container/HashBase.cpp
  37. 0 0
      Source/Engine/Container/HashBase.h
  38. 0 0
      Source/Engine/Container/HashMap.h
  39. 0 0
      Source/Engine/Container/HashSet.h
  40. 0 0
      Source/Engine/Container/LinkedList.h
  41. 0 0
      Source/Engine/Container/List.h
  42. 0 0
      Source/Engine/Container/ListBase.h
  43. 0 0
      Source/Engine/Container/Pair.h
  44. 0 0
      Source/Engine/Container/Ptr.h
  45. 0 0
      Source/Engine/Container/RefCounted.cpp
  46. 0 0
      Source/Engine/Container/RefCounted.h
  47. 0 0
      Source/Engine/Container/Sort.h
  48. 0 0
      Source/Engine/Container/Str.cpp
  49. 0 0
      Source/Engine/Container/Str.h
  50. 0 0
      Source/Engine/Container/Swap.cpp
  51. 0 0
      Source/Engine/Container/Swap.h
  52. 0 0
      Source/Engine/Container/Vector.h
  53. 0 0
      Source/Engine/Container/VectorBase.cpp
  54. 0 0
      Source/Engine/Container/VectorBase.h
  55. 0 0
      Source/Engine/Core/Attribute.h
  56. 0 0
      Source/Engine/Core/CMakeLists.txt
  57. 0 0
      Source/Engine/Core/Condition.cpp
  58. 0 0
      Source/Engine/Core/Condition.h
  59. 0 0
      Source/Engine/Core/Context.cpp
  60. 0 0
      Source/Engine/Core/Context.h
  61. 0 0
      Source/Engine/Core/CoreEvents.h
  62. 0 0
      Source/Engine/Core/Main.h
  63. 0 0
      Source/Engine/Core/MiniDump.cpp
  64. 0 0
      Source/Engine/Core/MiniDump.h
  65. 0 0
      Source/Engine/Core/Mutex.cpp
  66. 0 0
      Source/Engine/Core/Mutex.h
  67. 0 0
      Source/Engine/Core/Object.cpp
  68. 0 0
      Source/Engine/Core/Object.h
  69. 0 0
      Source/Engine/Core/Precompiled.cpp
  70. 0 0
      Source/Engine/Core/Precompiled.h
  71. 0 0
      Source/Engine/Core/ProcessUtils.cpp
  72. 0 0
      Source/Engine/Core/ProcessUtils.h
  73. 0 0
      Source/Engine/Core/Profiler.cpp
  74. 0 0
      Source/Engine/Core/Profiler.h
  75. 0 0
      Source/Engine/Core/StringUtils.cpp
  76. 0 0
      Source/Engine/Core/StringUtils.h
  77. 0 0
      Source/Engine/Core/Thread.cpp
  78. 0 0
      Source/Engine/Core/Thread.h
  79. 0 0
      Source/Engine/Core/Timer.cpp
  80. 0 0
      Source/Engine/Core/Timer.h
  81. 0 0
      Source/Engine/Core/Variant.cpp
  82. 0 0
      Source/Engine/Core/Variant.h
  83. 0 0
      Source/Engine/Core/WorkQueue.cpp
  84. 0 0
      Source/Engine/Core/WorkQueue.h
  85. 0 0
      Source/Engine/Engine/Application.cpp
  86. 0 0
      Source/Engine/Engine/Application.h
  87. 0 0
      Source/Engine/Engine/CMakeLists.txt
  88. 0 0
      Source/Engine/Engine/Console.cpp
  89. 0 0
      Source/Engine/Engine/Console.h
  90. 0 0
      Source/Engine/Engine/DebugHud.cpp
  91. 0 0
      Source/Engine/Engine/DebugHud.h
  92. 0 0
      Source/Engine/Engine/Engine.cpp
  93. 0 0
      Source/Engine/Engine/Engine.h
  94. 0 0
      Source/Engine/Engine/EngineEvents.h
  95. 0 0
      Source/Engine/Engine/Precompiled.cpp
  96. 0 0
      Source/Engine/Engine/Precompiled.h
  97. 0 0
      Source/Engine/Graphics/AnimatedModel.cpp
  98. 0 0
      Source/Engine/Graphics/AnimatedModel.h
  99. 0 0
      Source/Engine/Graphics/Animation.cpp
  100. 0 0
      Source/Engine/Graphics/Animation.h

+ 0 - 0
Bin/01_LuaHelloWorld.sh → Bin/01_LuaHelloWorld.sh


+ 0 - 0
Android/AndroidManifest.xml → Source/Android/AndroidManifest.xml


+ 0 - 0
Android/CopyData.bat → Source/Android/CopyData.bat


+ 0 - 0
Android/build.xml → Source/Android/build.xml


+ 1 - 1
Android/project.properties → Source/Android/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
 #proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
 
 
 # Project target.
 # Project target.
-target=android-8
+target=android-17

+ 0 - 0
Android/res/drawable-hdpi/icon.png → Source/Android/res/drawable-hdpi/icon.png


+ 0 - 0
Android/res/drawable-ldpi/icon.png → Source/Android/res/drawable-ldpi/icon.png


+ 0 - 0
Android/res/drawable-mdpi/icon.png → Source/Android/res/drawable-mdpi/icon.png


+ 0 - 0
Android/res/layout/main.xml → Source/Android/res/layout/main.xml


+ 0 - 0
Android/res/values/strings.xml → Source/Android/res/values/strings.xml


+ 0 - 0
Android/src/com/googlecode/urho3d/Urho3D.java → Source/Android/src/com/googlecode/urho3d/Urho3D.java


+ 0 - 0
Android/src/org/libsdl/app/SDLActivity.java → Source/Android/src/org/libsdl/app/SDLActivity.java


+ 0 - 0
CMakeLists.txt → Source/CMakeLists.txt


+ 0 - 0
Engine/Audio/Audio.cpp → Source/Engine/Audio/Audio.cpp


+ 0 - 0
Engine/Audio/Audio.h → Source/Engine/Audio/Audio.h


+ 0 - 0
Engine/Audio/AudioDefs.h → Source/Engine/Audio/AudioDefs.h


+ 0 - 0
Engine/Audio/CMakeLists.txt → Source/Engine/Audio/CMakeLists.txt


+ 0 - 0
Engine/Audio/Precompiled.cpp → Source/Engine/Audio/Precompiled.cpp


+ 0 - 0
Engine/Audio/Precompiled.h → Source/Engine/Audio/Precompiled.h


+ 0 - 0
Engine/Audio/Sound.cpp → Source/Engine/Audio/Sound.cpp


+ 0 - 0
Engine/Audio/Sound.h → Source/Engine/Audio/Sound.h


+ 0 - 0
Engine/Audio/SoundListener.cpp → Source/Engine/Audio/SoundListener.cpp


+ 0 - 0
Engine/Audio/SoundListener.h → Source/Engine/Audio/SoundListener.h


+ 0 - 0
Engine/Audio/SoundSource.cpp → Source/Engine/Audio/SoundSource.cpp


+ 0 - 0
Engine/Audio/SoundSource.h → Source/Engine/Audio/SoundSource.h


+ 0 - 0
Engine/Audio/SoundSource3D.cpp → Source/Engine/Audio/SoundSource3D.cpp


+ 0 - 0
Engine/Audio/SoundSource3D.h → Source/Engine/Audio/SoundSource3D.h


+ 21 - 1
Engine/CMakeLists.txt → Source/Engine/CMakeLists.txt

@@ -63,7 +63,7 @@ foreach (TARGET ${STATIC_LIBRARY_TARGETS})
             set (SYS_DIR "")
             set (SYS_DIR "")
             if (NOT MSVC)
             if (NOT MSVC)
                 get_filename_component (PATH ${SOURCE} PATH)
                 get_filename_component (PATH ${SOURCE} PATH)
-                foreach (DIR OpenGL Direct3D9 Source source src generated)
+                foreach (DIR OpenGL Direct3D9 source src generated)
                     if (PATH MATCHES /${DIR}$)
                     if (PATH MATCHES /${DIR}$)
                         set (SYS_DIR /${DIR})
                         set (SYS_DIR /${DIR})
                         break ()
                         break ()
@@ -104,3 +104,23 @@ if (APPLE AND LIB_TYPE STREQUAL SHARED)
     setup_macosx_framework (FRAMEWORKS)
     setup_macosx_framework (FRAMEWORKS)
     set_target_properties (${TARGET_NAME} PROPERTIES LINK_FLAGS ${FRAMEWORKS})
     set_target_properties (${TARGET_NAME} PROPERTIES LINK_FLAGS ${FRAMEWORKS})
 endif ()
 endif ()
+
+# Define post build steps
+file (MAKE_DIRECTORY ${PROJECT_SOURCE_DIR}/../Lib)
+if (MSVC)
+    add_custom_command (TARGET ${TARGET_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different \"$(TARGETPATH)\" \"${PROJECT_SOURCE_DIR}/../Lib\"
+        COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different \"$(TARGETDIR)$(TARGETNAME).pdb\" \"${PROJECT_SOURCE_DIR}/../Lib\"
+        COMMENT "Copying library and debug files to Lib directory")
+else ()
+    get_target_property (LOCATION ${TARGET_NAME} LOCATION)
+    if (CMAKE_CROSSCOMPILING)
+        file (MAKE_DIRECTORY ${PROJECT_SOURCE_DIR}/../Lib-CC)
+        add_custom_command (TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${LOCATION} ${PROJECT_SOURCE_DIR}/../Lib-CC)
+        if (SCP_TO_TARGET)
+            add_custom_command (TARGET ${TARGET_NAME} POST_BUILD COMMAND scp ${LOCATION} ${SCP_TO_TARGET} || exit 0)
+        endif ()
+    else ()   
+        add_custom_command (TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${LOCATION} ${PROJECT_SOURCE_DIR}/../Lib)
+    endif ()
+endif ()

+ 0 - 0
Engine/Container/Allocator.cpp → Source/Engine/Container/Allocator.cpp


+ 0 - 0
Engine/Container/Allocator.h → Source/Engine/Container/Allocator.h


+ 0 - 0
Engine/Container/ArrayPtr.h → Source/Engine/Container/ArrayPtr.h


+ 0 - 0
Engine/Container/CMakeLists.txt → Source/Engine/Container/CMakeLists.txt


+ 0 - 0
Engine/Container/DebugNew.h → Source/Engine/Container/DebugNew.h


+ 0 - 0
Engine/Container/ForEach.h → Source/Engine/Container/ForEach.h


+ 0 - 0
Engine/Container/Hash.h → Source/Engine/Container/Hash.h


+ 0 - 0
Engine/Container/HashBase.cpp → Source/Engine/Container/HashBase.cpp


+ 0 - 0
Engine/Container/HashBase.h → Source/Engine/Container/HashBase.h


+ 0 - 0
Engine/Container/HashMap.h → Source/Engine/Container/HashMap.h


+ 0 - 0
Engine/Container/HashSet.h → Source/Engine/Container/HashSet.h


+ 0 - 0
Engine/Container/LinkedList.h → Source/Engine/Container/LinkedList.h


+ 0 - 0
Engine/Container/List.h → Source/Engine/Container/List.h


+ 0 - 0
Engine/Container/ListBase.h → Source/Engine/Container/ListBase.h


+ 0 - 0
Engine/Container/Pair.h → Source/Engine/Container/Pair.h


+ 0 - 0
Engine/Container/Ptr.h → Source/Engine/Container/Ptr.h


+ 0 - 0
Engine/Container/RefCounted.cpp → Source/Engine/Container/RefCounted.cpp


+ 0 - 0
Engine/Container/RefCounted.h → Source/Engine/Container/RefCounted.h


+ 0 - 0
Engine/Container/Sort.h → Source/Engine/Container/Sort.h


+ 0 - 0
Engine/Container/Str.cpp → Source/Engine/Container/Str.cpp


+ 0 - 0
Engine/Container/Str.h → Source/Engine/Container/Str.h


+ 0 - 0
Engine/Container/Swap.cpp → Source/Engine/Container/Swap.cpp


+ 0 - 0
Engine/Container/Swap.h → Source/Engine/Container/Swap.h


+ 0 - 0
Engine/Container/Vector.h → Source/Engine/Container/Vector.h


+ 0 - 0
Engine/Container/VectorBase.cpp → Source/Engine/Container/VectorBase.cpp


+ 0 - 0
Engine/Container/VectorBase.h → Source/Engine/Container/VectorBase.h


+ 0 - 0
Engine/Core/Attribute.h → Source/Engine/Core/Attribute.h


+ 0 - 0
Engine/Core/CMakeLists.txt → Source/Engine/Core/CMakeLists.txt


+ 0 - 0
Engine/Core/Condition.cpp → Source/Engine/Core/Condition.cpp


+ 0 - 0
Engine/Core/Condition.h → Source/Engine/Core/Condition.h


+ 0 - 0
Engine/Core/Context.cpp → Source/Engine/Core/Context.cpp


+ 0 - 0
Engine/Core/Context.h → Source/Engine/Core/Context.h


+ 0 - 0
Engine/Core/CoreEvents.h → Source/Engine/Core/CoreEvents.h


+ 0 - 0
Engine/Core/Main.h → Source/Engine/Core/Main.h


+ 0 - 0
Engine/Core/MiniDump.cpp → Source/Engine/Core/MiniDump.cpp


+ 0 - 0
Engine/Core/MiniDump.h → Source/Engine/Core/MiniDump.h


+ 0 - 0
Engine/Core/Mutex.cpp → Source/Engine/Core/Mutex.cpp


+ 0 - 0
Engine/Core/Mutex.h → Source/Engine/Core/Mutex.h


+ 0 - 0
Engine/Core/Object.cpp → Source/Engine/Core/Object.cpp


+ 0 - 0
Engine/Core/Object.h → Source/Engine/Core/Object.h


+ 0 - 0
Engine/Core/Precompiled.cpp → Source/Engine/Core/Precompiled.cpp


+ 0 - 0
Engine/Core/Precompiled.h → Source/Engine/Core/Precompiled.h


+ 0 - 0
Engine/Core/ProcessUtils.cpp → Source/Engine/Core/ProcessUtils.cpp


+ 0 - 0
Engine/Core/ProcessUtils.h → Source/Engine/Core/ProcessUtils.h


+ 0 - 0
Engine/Core/Profiler.cpp → Source/Engine/Core/Profiler.cpp


+ 0 - 0
Engine/Core/Profiler.h → Source/Engine/Core/Profiler.h


+ 0 - 0
Engine/Core/StringUtils.cpp → Source/Engine/Core/StringUtils.cpp


+ 0 - 0
Engine/Core/StringUtils.h → Source/Engine/Core/StringUtils.h


+ 0 - 0
Engine/Core/Thread.cpp → Source/Engine/Core/Thread.cpp


+ 0 - 0
Engine/Core/Thread.h → Source/Engine/Core/Thread.h


+ 0 - 0
Engine/Core/Timer.cpp → Source/Engine/Core/Timer.cpp


+ 0 - 0
Engine/Core/Timer.h → Source/Engine/Core/Timer.h


+ 0 - 0
Engine/Core/Variant.cpp → Source/Engine/Core/Variant.cpp


+ 0 - 0
Engine/Core/Variant.h → Source/Engine/Core/Variant.h


+ 0 - 0
Engine/Core/WorkQueue.cpp → Source/Engine/Core/WorkQueue.cpp


+ 0 - 0
Engine/Core/WorkQueue.h → Source/Engine/Core/WorkQueue.h


+ 0 - 0
Engine/Engine/Application.cpp → Source/Engine/Engine/Application.cpp


+ 0 - 0
Engine/Engine/Application.h → Source/Engine/Engine/Application.h


+ 0 - 0
Engine/Engine/CMakeLists.txt → Source/Engine/Engine/CMakeLists.txt


+ 0 - 0
Engine/Engine/Console.cpp → Source/Engine/Engine/Console.cpp


+ 0 - 0
Engine/Engine/Console.h → Source/Engine/Engine/Console.h


+ 0 - 0
Engine/Engine/DebugHud.cpp → Source/Engine/Engine/DebugHud.cpp


+ 0 - 0
Engine/Engine/DebugHud.h → Source/Engine/Engine/DebugHud.h


+ 0 - 0
Engine/Engine/Engine.cpp → Source/Engine/Engine/Engine.cpp


+ 0 - 0
Engine/Engine/Engine.h → Source/Engine/Engine/Engine.h


+ 0 - 0
Engine/Engine/EngineEvents.h → Source/Engine/Engine/EngineEvents.h


+ 0 - 0
Engine/Engine/Precompiled.cpp → Source/Engine/Engine/Precompiled.cpp


+ 0 - 0
Engine/Engine/Precompiled.h → Source/Engine/Engine/Precompiled.h


+ 0 - 0
Engine/Graphics/AnimatedModel.cpp → Source/Engine/Graphics/AnimatedModel.cpp


+ 0 - 0
Engine/Graphics/AnimatedModel.h → Source/Engine/Graphics/AnimatedModel.h


+ 0 - 0
Engine/Graphics/Animation.cpp → Source/Engine/Graphics/Animation.cpp


+ 0 - 0
Engine/Graphics/Animation.h → Source/Engine/Graphics/Animation.h


Some files were not shown because too many files changed in this diff