Clean up SDK include dirs. Refactor FindUrho3D CMake module.

For Travis CI - add new steps to install the Urho3D SDK and to reference Urho3D library from the installed SDK.

CMake/Modules/FindUrho3D.cmake

@@ -29,21 +29,12 @@
 #  URHO3D_LIBRARIES_DBG
 #
 #
-# For internal Urho3D project, the Urho3D library "source tree" and "build tree" paths are already known.
+# For internal Urho3D project, the Urho3D "build tree" path is already known.
 #
-# For external project that attempts to use the Urho3D source and build trees:
-#   1) Set the URHO3D_HOME environment variable to poin to the location of Urho3D "source tree"
-#   2) Optionally, set the URHO3D_BUILD_TREE environment variable to point to the location of Urho3D "build tree" (if it differs from "source tree")
-# This module would not assume the location of the build tree anymore as in the previous versions.
-#
-# For external project that attempts to use the installed Urho3D SDK:
-#   1) Install the SDK into your filesystem.
-#      If you change the default value of CMAKE_INSTALL_PREFIX variable and/or if you use DESTDIR variable during installation, then proceed to 2)
-#   2) Set the CMAKE_PREFIX_PATH environment variable to point to the location of installed Urho3D SDK.
-#      The CMAKE_PREFIX_PATH should be set to a parent directory containing both the "include" or "lib" subdirectories.
-#      For example on Windows platform: set "CMAKE_PREFIX_PATH=C:/Users/john/Urho3D" if the SDK is installed using CMAKE_INSTALL_PREFIX=C:/Users/john/Urho3D
-#      For example on Linux platform: export CMAKE_PREFIX_PATH=/home/john/usr/local if the SDK is installed using DESTDIR=/home/john and CMAKE_INSTALL_PREFIX=/usr/local
-# You may use semicolon to separate multiple prefix paths to other SDKs intalled in custom location.
+# For external project that attempts to use the Urho3D build tree or installed Urho3D SDK,
+# use URHO3D_HOME environment variable to specify the path (not needed when the path is a system-wide default location).
+# When setting URHO3D_HOME environment variable, it should be set to a parent directory containing both the "include" or "lib" subdirectories.
+# For example: set URHO3D_HOME=/home/john/usr/local, if the SDK is installed using DESTDIR=/home/john and CMAKE_INSTALL_PREFIX=/usr/local
 #
 
 if (URHO3D_FOUND)
@@ -62,136 +53,61 @@ if (NOT URHO3D_LIB_TYPE STREQUAL URHO3D_FOUND_LIB_TYPE)
     endif ()
 endif ()
 
+set (PATH_SUFFIX Urho3D)
 if (CMAKE_PROJECT_NAME STREQUAL Urho3D AND TARGET Urho3D)
-    set (URHO3D_HOME ${CMAKE_SOURCE_DIR} CACHE PATH "Path to Urho3D source tree" FORCE)
-    set (IS_INTERNAL 1)
-elseif (NOT URHO3D_HOME AND DEFINED ENV{URHO3D_HOME})
-    # The URHO3D_HOME variable should point to Urho3D's source tree, even when Urho3D is being used in an external project which has its own source tree
-    file (TO_CMAKE_PATH "$ENV{URHO3D_HOME}" URHO3D_HOME)
-    set (URHO3D_HOME ${URHO3D_HOME} CACHE PATH "Path to Urho3D source tree")
-    if (DEFINED ENV{URHO3D_BUILD_TREE})
-        # Out-of-source build tree
-        file (TO_CMAKE_PATH "$ENV{URHO3D_BUILD_TREE}" URHO3D_BUILD_TREE)
-    else ()
-        # Assume to be non-out-source build tree
-        set (URHO3D_BUILD_TREE ${URHO3D_HOME})
-    endif ()
-    set (URHO3D_BUILD_TREE ${URHO3D_BUILD_TREE} CACHE PATH "Path to Urho3D build tree")
-endif ()
-
-if (URHO3D_HOME)
-    # Using source tree
-    if (EXISTS ${URHO3D_HOME}/Source/Urho3D/Urho3D.h.in)
-        set (ENGINE_DIRS Audio Container Core Engine Graphics Input IO Math Resource Scene UI)
-        set (THIRDPARTY_DIRS SDL/include)
-        if (URHO3D_ANGELSCRIPT)
-            list (APPEND ENGINE_DIRS Script)
-            list (APPEND THIRDPARTY_DIRS AngelScript/include)
-        endif ()
-        if (URHO3D_LUA)
-            list (APPEND ENGINE_DIRS LuaScript)
-        endif ()
-        if (URHO3D_NETWORK)
-            list (APPEND ENGINE_DIRS Network)
-            list (APPEND THIRDPARTY_DIRS kNet/include)
-        endif ()
-        if (URHO3D_NAVIGATION)
-            list (APPEND ENGINE_DIRS Navigation)
-        endif ()
-        if (URHO3D_PHYSICS)
-            list (APPEND ENGINE_DIRS Physics)
-            list (APPEND THIRDPARTY_DIRS Bullet/src)
-        endif ()
-        if (URHO3D_URHO2D)
-            list (APPEND ENGINE_DIRS Urho2D)
-            list (APPEND THIRDPARTY_DIRS Box2D)
-        endif ()
-        set (URHO3D_INCLUDE_DIRS ${URHO3D_HOME}/Source/Urho3D)
-        if (IS_INTERNAL)
-            list (APPEND URHO3D_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/Source/Urho3D)
-        else ()
-            list (APPEND URHO3D_INCLUDE_DIRS ${URHO3D_BUILD_TREE}/Source/Urho3D)
-        endif ()
-        foreach (DIR ${ENGINE_DIRS})
-            list (APPEND URHO3D_INCLUDE_DIRS ${URHO3D_HOME}/Source/Urho3D/${DIR})
-        endforeach ()
-        foreach (DIR ${THIRDPARTY_DIRS})
-            list (APPEND URHO3D_INCLUDE_DIRS ${URHO3D_HOME}/Source/ThirdParty/${DIR})
-        endforeach ()
-    endif ()
-endif ()
-
-if (IS_INTERNAL)
+    # Library location is already known to be in the build tree
+    set (URHO3D_HOME ${CMAKE_BINARY_DIR})
+    set (URHO3D_INCLUDE_DIRS ${URHO3D_HOME}/include/${PATH_SUFFIX} ${URHO3D_HOME}/include)
     set (URHO3D_LIBRARIES Urho3D)
     set (FOUND_MESSAGE "Found Urho3D: as CMake target")
 else ()
+    # Library location would be searched based on URHO3D_HOME variable
+    if (NOT URHO3D_HOME AND DEFINED ENV{URHO3D_HOME})
+        file (TO_CMAKE_PATH "$ENV{URHO3D_HOME}" URHO3D_HOME)
+    endif ()
     set (URHO3D_LIB_NAMES Urho3D)
-    if (WIN32)
-        set (URHO3D_LIB_NAMES_DBG ${URHO3D_LIB_NAMES}_d)
+    if (IOS)
+        set (CMAKE_LIBRARY_ARCHITECTURE ios)
     endif ()
-    if (URHO3D_BUILD_TREE)
-        # Using build tree
+    if (URHO3D_HOME AND NOT EXISTS ${URHO3D_HOME}/share)
+        set (URHO3D_INCLUDE_SEARCH_HINT HINTS ${URHO3D_HOME}/include NO_CMAKE_FIND_ROOT_PATH)
         if (ANDROID)
-            set (URHO3D_LIB_SEARCH_PATH ${URHO3D_BUILD_TREE}/libs/${ANDROID_NDK_ABI_NAME})
+            set (URHO3D_LIB_SEARCH_HINT HINTS ${URHO3D_HOME}/libs/${ANDROID_NDK_ABI_NAME} NO_CMAKE_FIND_ROOT_PATH)
         else ()
-            set (URHO3D_LIB_SEARCH_PATH ${URHO3D_BUILD_TREE}/lib)
-        endif ()
-        # Only perform a non-rooted search in the specified path
-        find_library (URHO3D_LIBRARIES NAMES ${URHO3D_LIB_NAMES} PATHS ${URHO3D_LIB_SEARCH_PATH} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-        if (WIN32)
-            find_library (URHO3D_LIBRARIES_DBG NAMES ${URHO3D_LIB_NAMES_DBG} PATHS ${URHO3D_LIB_SEARCH_PATH} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+            set (URHO3D_LIB_SEARCH_HINT HINTS ${URHO3D_HOME}/lib NO_CMAKE_FIND_ROOT_PATH)
         endif ()
     else ()
-        # Using SDK installation
-        if (NOT CMAKE_HOST_WIN32)
-            set (PATH_SUFFIX Urho3D)
-            if (IOS)
-                set (CMAKE_LIBRARY_ARCHITECTURE ios)
-            endif ()
-        endif ()
+        list (APPEND CMAKE_PREFIX_PATH ${URHO3D_HOME})
         if (ANDROID)
-            if (PATH_SUFFIX)
-                set (PATH_SUFFIX ${PATH_SUFFIX}/${ANDROID_NDK_ABI_NAME})
-            else ()
-                set (PATH_SUFFIX ${ANDROID_NDK_ABI_NAME})
-            endif ()
+            set (URHO3D_LIB_SEARCH_HINT HINTS ${URHO3D_HOME}/libs/${ANDROID_NDK_ABI_NAME})
         endif ()
-        # Perform a full search including a rooted search
-        find_path (URHO3D_INCLUDE_DIRS Urho3D.h PATH_SUFFIXES ${PATH_SUFFIX})
-        find_library (URHO3D_LIBRARIES NAMES ${URHO3D_LIB_NAMES} PATH_SUFFIXES ${PATH_SUFFIX})
-        if (WIN32)
-            find_library (URHO3D_LIBRARIES_DBG NAMES ${URHO3D_LIB_NAMES_DBG} PATH_SUFFIXES ${PATH_SUFFIX})
+        if (NOT URHO3D_64BIT)
+            set_property (GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
         endif ()
-        if (URHO3D_INCLUDE_DIRS)
-            set (BASE_DIR ${URHO3D_INCLUDE_DIRS})
-            set (DIRS SDL)
-            if (URHO3D_ANGELSCRIPT)
-                list (APPEND DIRS AngelScript)
-            endif ()
-            if (URHO3D_NETWORK)
-                list (APPEND DIRS kNet)
-            endif ()
-            if (URHO3D_PHYSICS)
-                list (APPEND DIRS Bullet)
-            endif ()
-            if (URHO3D_URHO2D)
-                list (APPEND DIRS Box2D)
-            endif ()
-            foreach (DIR ${DIRS})
-                list (APPEND URHO3D_INCLUDE_DIRS ${BASE_DIR}/${DIR})     # Note: variable change to list context after this, so we need BASE_DIR to remain the same
-            endforeach ()
+    endif ()
+    find_path (URHO3D_INCLUDE_DIRS Urho3D.h ${URHO3D_INCLUDE_SEARCH_HINT} PATH_SUFFIXES ${PATH_SUFFIX})
+    find_library (URHO3D_LIBRARIES NAMES ${URHO3D_LIB_NAMES} ${URHO3D_LIB_SEARCH_HINT} PATH_SUFFIXES ${PATH_SUFFIX})
+    if (WIN32)
+        find_library (URHO3D_LIBRARIES_DBG NAMES ${URHO3D_LIB_NAMES}_d ${URHO3D_LIB_SEARCH_HINT} PATH_SUFFIXES ${PATH_SUFFIX})
+    endif ()
+    if (URHO3D_INCLUDE_DIRS)
+        get_filename_component (PATH ${URHO3D_INCLUDE_DIRS} PATH)
+        list (APPEND URHO3D_INCLUDE_DIRS ${PATH})
+        if (NOT URHO3D_HOME)
+            # URHO3D_HOME is not set when using SDK installed on system-wide default location, so set it now
+            get_filename_component (PATH ${PATH} PATH)
+            set (URHO3D_HOME ${PATH})
         endif ()
     endif ()
-endif ()
-
-if (WIN32)
-    set (URHO3D_LIBRARIES_REL ${URHO3D_LIBRARIES})
-    if (URHO3D_LIBRARIES)
-        if (URHO3D_LIBRARIES_DBG)
-            list (APPEND URHO3D_LIBRARIES ${URHO3D_LIBRARIES_DBG})
+    if (WIN32)
+        set (URHO3D_LIBRARIES_REL ${URHO3D_LIBRARIES})
+        if (URHO3D_LIBRARIES)
+            if (URHO3D_LIBRARIES_DBG)
+                list (APPEND URHO3D_LIBRARIES ${URHO3D_LIBRARIES_DBG})
+            endif ()
+        else ()
+            set (URHO3D_LIBRARIES ${URHO3D_LIBRARIES_DBG})
         endif ()
-    else ()
-        set (URHO3D_LIBRARIES ${URHO3D_LIBRARIES_DBG})
     endif ()
 endif ()
 
@@ -200,18 +116,13 @@ if (URHO3D_INCLUDE_DIRS AND URHO3D_LIBRARIES)
     if (NOT FOUND_MESSAGE)
         set (FOUND_MESSAGE "Found Urho3D: ${URHO3D_LIBRARIES}")
     endif ()
-endif ()
-
-if (URHO3D_FOUND)
     include (FindPackageMessage)
     FIND_PACKAGE_MESSAGE (Urho3D ${FOUND_MESSAGE} "[${URHO3D_LIBRARIES}][${URHO3D_INCLUDE_DIRS}]")
-else ()
-    if (Urho3D_FIND_REQUIRED)
-        message (FATAL_ERROR
-            "Could not find Urho3D library in Urho3D source/build trees or SDK installation. "
-            "To search in Urho3D source/build trees, Use URHO3D_HOME and URHO3D_BUILD_TREE environment variables to specify the location of source and build tree, respectively. "
-            "To search in a non-default Urho3D SDK installation location, use CMAKE_PREFIX_PATH environment variable to specify the prefix path of the installation location.")
-    endif ()
+    set (URHO3D_HOME ${URHO3D_HOME} CACHE PATH "Path to Urho3D build tree or SDK installation location")
+elseif (Urho3D_FIND_REQUIRED)
+    message (FATAL_ERROR
+        "Could not find Urho3D library in Urho3D build tree or SDK installation. "
+        "Use URHO3D_HOME environment variable to specify the location of the build tree or SDK installation.")
 endif ()
 
-mark_as_advanced (URHO3D_INCLUDE_DIRS URHO3D_LIBRARIES URHO3D_HOME URHO3D_BUILD_TREE)
+mark_as_advanced (URHO3D_INCLUDE_DIRS URHO3D_LIBRARIES URHO3D_HOME)

CMake/Modules/Urho3D-CMake-common.cmake

@@ -655,28 +655,6 @@ macro (setup_ios_linker_flags LINKER_FLAGS)
     set (${LINKER_FLAGS} "${${LINKER_FLAGS}} -framework AudioToolbox -framework CoreAudio -framework CoreGraphics -framework Foundation -framework OpenGLES -framework QuartzCore -framework UIKit")
 endmacro ()
 
-# Macro for adding SDL native init function on Android platform
-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
-    # 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)
-        # 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)
-    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")
-    endif ()
-    mark_as_advanced (ANDROID_MAIN_C_PATH)  # Hide it from cmake-gui in non-advanced mode
-    if (ANDROID_MAIN_C_PATH)
-        list (APPEND SOURCE_FILES ${ANDROID_MAIN_C_PATH})
-    else ()
-        message (FATAL_ERROR
-            "Could not find SDL_android_main.c source file in default SDK installation location or Urho3D project root tree. "
-            "For searching in a non-default Urho3D SDK installation, use 'CMAKE_PREFIX_PATH' environment variable to specify the prefix path of the installation location. "
-            "For searching in a source tree of Urho3D project, use 'URHO3D_HOME' environment variable to specify the Urho3D project root directory.")
-    endif ()
-endmacro ()
-
 # Macro for setting up an executable target with resources to copy
 macro (setup_main_executable)
     # Define resource files
@@ -687,8 +665,16 @@ macro (setup_main_executable)
     endif ()
 
     if (ANDROID)
-        # Add SDL native init function, SDL_Main() entry point must be defined by one of the source files in ${SOURCE_FILES} 
-        add_android_native_init ()
+        # Add SDL native init function, SDL_Main() entry point must be defined by one of the source files in ${SOURCE_FILES}
+        find_file (ANDROID_MAIN_C_PATH SDL_android_main.c HINTS ${URHO3D_HOME}/include/${PATH_SUFFIX}/SDL/android PATH_SUFFIXES ${PATH_SUFFIX} DOC "Path to SDL_android_main.c" NO_CMAKE_FIND_ROOT_PATH)
+        mark_as_advanced (ANDROID_MAIN_C_PATH)  # Hide it from cmake-gui in non-advanced mode
+        if (ANDROID_MAIN_C_PATH)
+            list (APPEND SOURCE_FILES ${ANDROID_MAIN_C_PATH})
+        else ()
+            message (FATAL_ERROR
+                "Could not find SDL_android_main.c source file in the Urho3D build tree or SDK installation. "
+                "Please reconfigure and rebuild your Urho3D build tree; or reinstall the SDK.")
+        endif ()
         # Setup shared library output path
         set_output_directories (${ANDROID_LIBRARY_OUTPUT_PATH} LIBRARY)
         # Setup target as main shared library
@@ -952,10 +938,6 @@ macro (install_header_files)
                 endif ()
                 file (GLOB_RECURSE NAMES ${GLOBBING_EXPRESSION})
                 foreach (NAME ${NAMES})
-                    get_filename_component (PATH ${NAME} PATH)
-                    if (PATH AND NOT EXISTS ${ARG_DESTINATION}/${PATH})
-                        file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${ARG_DESTINATION}/${PATH})
-                    endif ()
                     create_symlink (${INSTALL_SOURCE}${NAME} ${ARG_DESTINATION}/${NAME} FALLBACK_TO_COPY)
                 endforeach ()
             else ()

CMakeLists.txt

@@ -52,30 +52,24 @@ if (WIN32)
 else ()
     set (SCRIPT_EXT .sh)
 endif ()
-if (NOT CMAKE_HOST_WIN32)
-    # CMake already automatically appends "Urho3D" to CMAKE_INSTALL_PREFIX on Windows platform
-    set (PATH_SUFFIX /Urho3D)
-    if (URHO3D_64BIT)
-        if (EXISTS /usr/lib64)
-            # Probably host system is a RedHat-based distro
-            set (LIB_SUFFIX 64)
-        endif ()
-    endif ()
-    if (IOS)
-        # Use 'ios' arch subdirectory to differentiate, in case both Mac OS X and iOS build are installed at the same destination
-        set (LIB_SUFFIX ${LIB_SUFFIX}/ios)
+set (PATH_SUFFIX Urho3D)
+if (IOS)
+    # Use 'ios' arch subdirectory to differentiate, in case both Mac OS X and iOS build are installed at the same destination
+    set (LIB_SUFFIX ios)
+elseif (ANDROID)
+    set (LIB_SUFFIX s/${ANDROID_NDK_ABI_NAME})
+elseif (URHO3D_64BIT)
+    if (NOT CMAKE_HOST_WIN32 AND EXISTS /usr/lib64)
+        # Probably host system is a RedHat-based distro
+        set (LIB_SUFFIX 64)
     endif ()
 endif ()
-set (DEST_INCLUDE_DIR include${PATH_SUFFIX})
-file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DEST_INCLUDE_DIR})
-set (DEST_SHARE_DIR share${PATH_SUFFIX})
+set (DEST_INCLUDE_DIR include/${PATH_SUFFIX})
+set (DEST_SHARE_DIR share/${PATH_SUFFIX})
 set (DEST_RUNTIME_DIR ${DEST_SHARE_DIR}/Bin)
-# Note: ${PATH_SUFFIX} for library could be removed if the extra path is not desirable, but if so then the RPATH setting below needs to be adjusted accordingly
-set (DEST_LIBRARY_DIR lib${LIB_SUFFIX}${PATH_SUFFIX})
-if (ANDROID)
-    set (DEST_RUNTIME_DIR ${DEST_RUNTIME_DIR}/${ANDROID_NDK_ABI_NAME})
-    set (DEST_LIBRARY_DIR ${DEST_LIBRARY_DIR}/${ANDROID_NDK_ABI_NAME})
-endif ()
+# Note: ${PATH_SUFFIX} for library could be removed if the extra path is not desired, but if so then the RPATH setting in Source's CMakeLists.txt needs to be adjusted accordingly
+set (DEST_LIBRARY_DIR lib${LIB_SUFFIX}/${PATH_SUFFIX})
+# TODO: Refactor to use CMAKE_SYSROOT variable instead of our own SYSROOT variable when CMake minimum version is upgraded to 3.0.x
 set (SYSROOT ${ANDROID_TOOLCHAIN_ROOT} ${RPI_SYSROOT} ${MINGW_SYSROOT})         # SYSROOT is empty for native build
 string (REPLACE "${SYSROOT}" "" DEST_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})    # Our CMAKE_INSTALL_PREFIX is rooted, use DEST_INSTALL_PREFIX for the non-rooted version
 set (DEST_PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
@@ -137,6 +131,11 @@ if (NOT DEFINED ENV{RELEASE_TAG})
 endif ()
 include (CPack)
 
+# Setup SDL-like include dir in the build tree
+foreach (DIR Direct3D9 OpenGL SDL)
+    file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DEST_INCLUDE_DIR}/${DIR})
+endforeach ()
+
 # Urho3D source
 add_subdirectory (Source)
 

Docs/GettingStarted.dox

@@ -320,7 +320,7 @@ F2          Toggle debug HUD
 
 \page UsingLibrary Using Urho3D as external library
 
-This page shows how to create a new C++ project linking against Urho3D library as external library. There are two approaches to do this. It is imperative to clean the CMake cache when changing from one approach to the other. In fact, you also need to clean the cache when any of the environment variables required by the CMake build script below change its value.
+This page shows how to create a new C++ project linking against Urho3D library as external library. There are two approaches to do this. The first approach uses Urho3D library directly from the Urho3D project build tree. The second approach uses Urho3D SDK installation. It is imperative to clean the CMake cache when changing from one approach to the other. In fact, you also need to clean the cache when any of the environment variables required by the CMake build script below change its value.
 
 First of all, structure your project similar to Urho3D project as below, although this is not mandatory now:
 
@@ -330,6 +330,9 @@ PROJECT_ROOT/
  ┝ Bin/
  ╎  ┝ Data/
  ╎  ┕ CoreData/
+ ┝ CMake/
+ ╎  ┝ Modules/
+ ╎  ┕ Toolchains/
  ┝ Docs/                if you do documentation at all
  ┝ Source/              if you have large project with sources arranged in hierarchy
  ┝ CMakeListst.txt
@@ -337,11 +340,13 @@ PROJECT_ROOT/
  ┕ *.bat or *.sh
 \endcode
 
-The physical project root directory is also now the logical project source tree in CMake terminology where your project main CMakeLists.txt should reside. The Bin directory should contain the Data and CoreData resource subdirs. Unless you intend to configure to use your project root directory as your project build tree as well, all the executables will not be actually generated in this Bin directory. However, the executables will always be generated in the Bin directory in the project build tree (which is now fully user defined). Therefore, in order to run the executable in the build tree's Bin directory, you need to copy (or symlink) the resource directories (Data and CoreData) from your source tree to your build tree. Alternatively, you can use URHO3D_PREFIX_PATH environment variable to point to a prefix path containing the resource dirs. You may also want to copy (or symlink) the batch files or shell script files from Urho3D project root directory (or from Urho3D SDK installation) to your project root directory. The *.bat or *.sh scripts work together with the Urho3D CMake module to configure and generate the initial project build tree. Both out-of-source build tree (recommended) and non out-of-source build tree are now supported. Note that when you invoke one the *.bat or *.sh script for your project, you can also pass most of the \ref Build_Options "build options" supported by Urho3D project. In fact, you probably have to pass the similar build options that you use when building the Urho3D library to avoid any conflict.
+The physical project root directory is also now the logical project source tree in CMake terminology where your project main CMakeLists.txt should reside. The Bin directory should contain the Data and CoreData resource subdirs. Unless you intend to configure to use your project root directory as your project build tree as well, all the executables will not be actually generated in this Bin directory. The executables will always be generated in the Bin directory of the project build tree (which is now fully user defined). Therefore, in order to run the executable in the build tree's Bin directory, you need to copy (or symlink) the resource directories (Data and CoreData) from your source tree to your build tree. Alternatively, you can use URHO3D_PREFIX_PATH environment variable to point to a prefix path containing the resource dirs. Urho3D engine automatically uses this prefix path when obtaining resources. By default the engine uses the program executable path.
 
-\section UsingLibraryFromProjectSourceAndBuildTrees From Urho3D project source tree and build tree
+You may also want to copy (or symlink) the batch files or shell script files from Urho3D project root directory (or from Urho3D SDK installation) to your project root directory. The *.bat or *.sh scripts work together with the Urho3D CMake module to configure and generate your initial project build tree. Both out-of-source build tree (recommended) and non out-of-source build tree are now supported. Note that when you invoke one the *.bat or *.sh script for your project, you can also pass most of the \ref Build_Options "build options" supported by Urho3D project. In fact, you probably have to pass the similar build options that you use when building the Urho3D library to avoid any conflict.
 
-This section assumes that you have already successfully build a static or shared library in the Urho3D project (separately from your own project). In order to find the Urho3D headers and its CMake modules, specify an environment variable called "URHO3D_HOME" which points to the Urho3D project root directory (aka Urho3D source tree). Then also specify another environment variable called "URHO3D_BUILD_TREE" which points to the location of the Urho3D build tree (if it is different than the Urho3D source tree) in order to find the Urho3D library in its build tree.
+\section UsingLibraryFromProjectBuildTree From Urho3D project build tree
+
+This section assumes that you have already successfully build a static or shared library in the Urho3D project (separately from your own project). In order to find the Urho3D headers and library this way, specify an environment variable called "URHO3D_HOME" which points to the Urho3D project build tree that you configured earlier to build Urho3D project. Note that this is not the Urho3D project root directory (unless Urho3D build tree location is the same as Urho3D project root directory).
 
 In your own project root directory, create a main CMakeLists.txt file and add the following lines: (replace MyProjectName and MyExecutableName with the actual names you want)
 
@@ -368,7 +373,7 @@ endif ()
 
 # Set CMake modules search path
 set (CMAKE_MODULE_PATH
-    $ENV{URHO3D_HOME}/CMake/Modules
+    CMake/Modules
     CACHE PATH "Path to Urho3D-specific CMake modules")
 
 # Include Urho3D Cmake common module
@@ -404,23 +409,18 @@ The setup_main_executable() macro then uses SOURCE_FILES and TARGET_NAME variabl
 
 \section FromSDK From Urho3D SDK installation
 
-This section assumes that you have already installed Urho3D SDK into your system. If you have installed the SDK in a non-default location then you need to use "CMAKE_PREFIX_PATH" environment variable to specify the prefix path of the non-default installation location.
+This section assumes that you have already installed Urho3D SDK into your system. If you have installed the SDK in a non-default location then you need to use "URHO3D_HOME" environment variable to specify the prefix path of the non-default installation location.
 
 In your own project root directory, create a main CMakeLists.txt file similar to the first approach but change the CMake module search path setup to read as follows:
 
 \code
 # Set CMake modules search path
-if (NOT CMAKE_HOST_WIN32)
-    set (MODULE_PATH_SUFFIX Urho3D/)
-endif ()
 set (CMAKE_MODULE_PATH
-    $ENV{CMAKE_PREFIX_PATH}/share/${MODULE_PATH_SUFFIX}CMake/Modules
-    ${CMAKE_INSTALL_PREFIX}/share/${MODULE_PATH_SUFFIX}CMake/Modules
+    $ENV{URHO3D_HOME}/share/Urho3D/CMake/Modules
+    ${CMAKE_INSTALL_PREFIX}/share/Urho3D/CMake/Modules
     CACHE PATH "Path to Urho3D-specific CMake modules")
 \endcode
 
-The MODULE_PATH_SUFFIX CMake variable is not required on Windows host because CMake already prepends 'Urho3D' into CMAKE_INSTALL_PREFIX path by default. Adjust this accordingly if you don't use this convention.
-
 \subsection FromSDKWithPkgConfig Using pkg-config instead of CMake
 
 If for some reason you could not use CMake in your project, you could configure your project to compile and link against Urho3D library from SDK installation using 'pkg-config' tool with the help of 'Urho3D.pc' configuration file (which is installed as part of the SDK installation). If the Urho3D SDK is being installed into a local location (such as /usr/local) or a non-default location, then most likely you would need to specify PKG_CONFIG_PATH environment variable to point to the location of the configuration file for this to work. The 'Urho3D.pc' file contains important information on how to configure your compiler and linker correctly. You can use that information as a reference to configure your own project even when you do not use 'pkg-config' tool.

Rakefile

@@ -42,13 +42,16 @@ task :scaffolding do
   scaffolding(abs_path, project, target)
   abs_path = Pathname.new(abs_path).realpath
   puts "\nNew project created in #{abs_path}\n\n"
-  puts "To build the new project, you may need to first set and export either 'URHO3D_HOME' and 'URHO3D_BUILD_TREE'; or 'CMAKE_PREFIX_PATH' environment variable"
-  puts "Please see http://urho3d.github.io/documentation/HEAD/_using_library.html for more detail. For example of using Urho3D source and build trees directly:\n\n"
+  puts "To build the new project, you may need to first set and export 'URHO3D_HOME' to point to your Urho3D build tree or your custom Urho3D SDK installation location."
+  puts "Please see http://urho3d.github.io/documentation/HEAD/_using_library.html for more detail. For example:\n\n"
   if ENV['OS']
-    puts "set URHO3D_HOME=#{Dir.pwd}\nset URHO3D_BUILD_TREE=/path/to/your/build/tree\ncd #{abs_path}\ncmake_vs2013.bat -DURHO3D_64BIT=1 -DURHO3D_LUAJIT=1\n\n"
+    puts "set URHO3D_HOME=/path/to/Urho3D/build/tree\ncd #{abs_path}\nrake cmake URHO3D_64BIT=1 URHO3D_LUAJIT=1\nrake make\n\n"
+    puts "Alternatively you can call one of the batch files directly, such as, cmake_vs2013.bat ../native-Build -DURHO3D_64BIT=1 -DURHO3D_LUAJIT=1 and build using VS IDE"
   else
-    puts "export URHO3D_HOME=#{Dir.pwd} URHO3D_BUILD_TREE=/path/to/your/build/tree\ncd #{abs_path}\n./cmake_generic.sh -DURHO3D_LUAJIT=1\ncd Build\nmake\n\n"
+    puts "export URHO3D_HOME=/path/to/Urho3D/build/tree\ncd #{abs_path}\nrake cmake URHO3D_LUAJIT=1\nrake make\n\n"
+    puts "Alternatively you can call one of the shell scripts directly, such as, ./cmake_generic.sh ../native-Build -DURHO3D_LUAJIT=1 && cd ../native-Build && make"
   end
+  puts "to get a similar result as the last two rake tasks above.\n\n"
 end
 
 # Usage: rake cmake [prefix_path=..] [fix_scm] (only intended to be used by lazy man =), e.g. rake cmake clean android; rake cmake android URHO3D_LIB_TYPE=SHARED
@@ -104,7 +107,6 @@ task :make do
     end
   }
   if !Dir.glob("#{prefix_path}/#{platform}-Build/*.xcodeproj").empty?
-    build_options.gsub!(/ ([^=]+)=(\w+)/, ' -\1 \2')
     filter = '|xcpretty'
   elsif !Dir.glob("#{prefix_path}/#{platform}-Build/*.sln").empty?
     filter = ''
@@ -202,7 +204,7 @@ task :ci_site_update do
       bump_soversion 'Source/Urho3D/.soversion' or abort 'Failed to bump soversion'
       system "git add Source/Urho3D/.soversion && git commit --amend -q -m 'Travis CI: API documentation update at #{Time.now.utc}.\n[ci #{instruction}]'" or abort 'Failed to stage .soversion file'
     end
-    system "git push origin HEAD:master -q >/dev/null 2>&1" or abort 'Failed to update API documentation, most likely due to remote master has diverged, the API documentation update will be performed again in the subsequent CI build'
+    system 'git push origin HEAD:master -q >/dev/null 2>&1' or abort 'Failed to update API documentation, most likely due to remote master has diverged, the API documentation update will be performed again in the subsequent CI build'
   end
 end
 
@@ -230,9 +232,9 @@ task :ci_package_upload do
   unless ENV['SITE_UPDATE']
     system 'echo Generate documentation'
     if ENV['XCODE']
-      xcode_build(ENV['IOS'], "../Build/Urho3D.xcodeproj", 'doc', '>/dev/null') or abort 'Failed to generate documentation'
+      xcode_build(ENV['IOS'], '../Build/Urho3D.xcodeproj', 'doc', '>/dev/null') or abort 'Failed to generate documentation'
     else
-      system "cd ../Build && make -j$NUMJOBS doc >/dev/null" or abort 'Failed to generate documentation'
+      system 'cd ../Build && make -j$NUMJOBS doc >/dev/null' or abort 'Failed to generate documentation'
     end
   end
   # Make the package
@@ -245,17 +247,17 @@ task :ci_package_upload do
     if !ENV['CI_START_TIME'] || elapsed_time < 15 # minutes
       # Build Mach-O universal binary consisting of iphoneos (universal ARM archs including 'arm64' if 64-bit is enabled) and iphonesimulator (i386 arch and also x86_64 arch if 64-bit is enabled)
       system 'echo Rebuild Urho3D library as Mach-O universal binary'
-      xcode_build(0, "../Build/Urho3D.xcodeproj", 'Urho3D_universal') or abort 'Failed to build Mach-O universal binary'
+      xcode_build(0, '../Build/Urho3D.xcodeproj', 'Urho3D_universal') or abort 'Failed to build Mach-O universal binary'
     end
     # There is a bug in CMake/CPack that causes the 'package' target failed to build for IOS platform, workaround by calling cpack directly
-    system "cd ../Build && cpack -G TGZ 2>/dev/null" or abort 'Failed to make binary package'
+    system 'cd ../Build && cpack -G TGZ 2>/dev/null' or abort 'Failed to make binary package'
   elsif ENV['XCODE']
-    xcode_build(ENV['IOS'], "../Build/Urho3D.xcodeproj", 'package') or abort 'Failed to make binary package'
+    xcode_build(ENV['IOS'], '../Build/Urho3D.xcodeproj', 'package') or abort 'Failed to make binary package'
   else
     if ENV['ANDROID'] && !ENV['NO_SDK_SYSIMG']
-      system "cd ../Build && android update project -p . -t $( android list target |grep android-$API |cut -d ' ' -f2 ) && ant debug" or abort 'Failed to make Urho3D Samples APK'
+      system "cd ../Build && android update project -p . -t $(android list target |grep android-$API |cut -d ' ' -f2) && ant debug" or abort 'Failed to make Urho3D Samples APK'
     end
-    system "cd ../Build && make package" or abort 'Failed to make binary package'
+    system 'cd ../Build && make package' or abort 'Failed to make binary package'
   end
   # Determine the upload location
   setup_digital_keys
@@ -318,13 +320,10 @@ if (COMMAND cmake_policy)
 endif ()
 
 # Set CMake modules search path
-if (NOT CMAKE_HOST_WIN32)
-    set (MODULE_PATH_SUFFIX Urho3D/)
-endif ()
 set (CMAKE_MODULE_PATH
-    $ENV{URHO3D_HOME}/CMake/Modules
-    $ENV{CMAKE_PREFIX_PATH}/share/${MODULE_PATH_SUFFIX}CMake/Modules
-    ${CMAKE_INSTALL_PREFIX}/share/${MODULE_PATH_SUFFIX}CMake/Modules
+    CMake/Modules
+    $ENV{URHO3D_HOME}/share/Urho3D/CMake/Modules
+    ${CMAKE_INSTALL_PREFIX}/share/Urho3D/CMake/Modules
     CACHE PATH \"Path to Urho3D-specific CMake modules\")
 
 # Include Urho3D CMake common module
@@ -353,9 +352,9 @@ endif ()
 EOF
   # TODO: Rewrite in pure Ruby when it supports symlink creation on Windows platform
   if ENV['OS']
-    system("@echo off && mkdir #{dir}\\Bin && copy Source\\Tools\\Urho3DPlayer\\Urho3DPlayer.* #{dir} >nul && (for %f in (*.bat Rakefile) do mklink #{dir}\\%f %cd%\\%f >nul) && (for %d in (CoreData,Data) do mklink /D #{dir}\\Bin\\%d %cd%\\Bin\\%d >nul)") && File.write("#{dir}/CMakeLists.txt", build_script) or abort 'Failed to create new project using Urho3D as external library'
+    system("@echo off && mkdir #{dir}\\Bin && copy Source\\Tools\\Urho3DPlayer\\Urho3DPlayer.* #{dir} >nul && (for %f in (*.bat Rakefile) do mklink #{dir}\\%f %cd%\\%f >nul) && mklink /D #{dir}\\CMake %cd%\\CMake && (for %d in (CoreData,Data) do mklink /D #{dir}\\Bin\\%d %cd%\\Bin\\%d >nul)") && File.write("#{dir}/CMakeLists.txt", build_script) or abort 'Failed to create new project using Urho3D as external library'
   else
-    system("bash -c \"mkdir -p #{dir}/Bin && cp Source/Tools/Urho3DPlayer/Urho3DPlayer.* #{dir} && for f in {.,}*.sh Rakefile; do ln -sf `pwd`/\\$f #{dir}; done && ln -sf `pwd`/Bin/{Core,}Data #{dir}/Bin\"") && File.write("#{dir}/CMakeLists.txt", build_script) or abort 'Failed to create new project using Urho3D as external library'
+    system("bash -c \"mkdir -p #{dir}/Bin && cp Source/Tools/Urho3DPlayer/Urho3DPlayer.* #{dir} && for f in {.,}*.sh Rakefile CMake; do ln -sf `pwd`/\\$f #{dir}; done && ln -sf `pwd`/Bin/{Core,}Data #{dir}/Bin\"") && File.write("#{dir}/CMakeLists.txt", build_script) or abort 'Failed to create new project using Urho3D as external library'
   end
 end
 
@@ -381,15 +380,16 @@ def makefile_ci
   if ENV['AVD'] && !ENV['PACKAGE_UPLOAD']   # Skip APK test run when packaging
       android_prepare_device ENV['API'], ENV['ABI'], ENV['AVD'] or abort 'Failed to prepare Android (virtual) device for test run'
   end
-  if $testing == 1
-    test = '&& make test'
-  else
-    test = ''
-  end
+  test = $testing == 1 ? '&& make test' : ''
   system "cd ../Build && make -j$NUMJOBS #{test}" or abort 'Failed to build or test Urho3D library'
-  # Create a new project on the fly that uses newly built Urho3D library
-  scaffolding "../Build/generated/UsingSourceAndBuildTrees"
-  system "export URHO3D_HOME=`pwd` URHO3D_BUILD_TREE=../.. && cd ../Build/generated/UsingSourceAndBuildTrees && echo '\nExternal project using Urho3D source and build trees' && ./cmake_generic.sh . #{$build_options} -DURHO3D_LUA#{jit}=1 -DURHO3D_TESTING=#{$testing} -DCMAKE_BUILD_TYPE=#{$configuration} && make -j$NUMJOBS #{test}" or abort 'Failed to configure/build/test temporary project using Urho3D as external library' 
+  # Create a new project on the fly that uses newly built Urho3D library in the build tree
+  scaffolding "../Build/generated/UsingBuildTree"
+  system "export URHO3D_HOME=../.. && cd ../Build/generated/UsingBuildTree && echo '\nExternal project referencing Urho3D library in its build tree' && ./cmake_generic.sh . #{$build_options} -DURHO3D_LUA#{jit}=1 -DURHO3D_TESTING=#{$testing} -DCMAKE_BUILD_TYPE=#{$configuration} && make -j$NUMJOBS #{test}" or abort 'Failed to configure/build/test temporary project using Urho3D as external library' 
+  puts "\nInstalling Urho3D SDK...\n"
+  # Create a new project on the fly that uses newly installed Urho3D SDK
+  install_destination = ENV['LINUX'] || ENV['OSX'] ? 'DESTDIR=~ && export URHO3D_HOME=~/usr/local' : ''
+  scaffolding "../Build/generated/UsingSDK"
+  system "cd ../Build && make -j$NUMJOBS install >/dev/null #{install_destination} && cd ../Build/generated/UsingSDK && echo '\nExternal project referencing Urho3D SDK' && ./cmake_generic.sh . #{$build_options} -DURHO3D_LUA#{jit}=1 -DURHO3D_TESTING=#{$testing} -DCMAKE_BUILD_TYPE=#{$configuration} && make -j$NUMJOBS #{test}" or abort 'Failed to configure/build/test temporary project using Urho3D as external library'
   # Make, deploy, and test run Android APK in an Android (virtual) device
   if ENV['AVD'] && !ENV['PACKAGE_UPLOAD']
     system "echo '\nTest deploying and running Urho3D Samples APK...' && cd ../Build && android update project -p . -t $( android list target |grep android-$API |cut -d ' ' -f2 ) && ant debug" or abort 'Failed to make Urho3D Samples APK'
@@ -493,11 +493,17 @@ def xcode_ci
     deployment_target = "-DCMAKE_OSX_DEPLOYMENT_TARGET=#{ENV['DEPLOYMENT_TARGET']}"
   end
   system "./cmake_macosx.sh ../Build -DIOS=$IOS #{deployment_target} -DURHO3D_LIB_TYPE=$URHO3D_LIB_TYPE #{$build_options} -DURHO3D_LUA#{jit}=1 #{amalg} -DURHO3D_SAMPLES=1 -DURHO3D_TOOLS=1 -DURHO3D_EXTRAS=1 -DURHO3D_TESTING=#{$testing}" or abort 'Failed to configure Urho3D library build'
-  xcode_build(ENV['IOS'], "../Build/Urho3D.xcodeproj") or abort 'Failed to build or test Urho3D library'
-  # Create a new project on the fly that uses newly built Urho3D library
-  scaffolding "../Build/generated/UsingSourceAndBuildTrees"
-  system "export URHO3D_HOME=`pwd` URHO3D_BUILD_TREE=../.. && cd ../Build/generated/UsingSourceAndBuildTrees && echo '\nExternal project using Urho3D source and build trees' && ./cmake_macosx.sh . -DIOS=$IOS #{deployment_target} #{$build_options} -DURHO3D_LUA#{jit}=1 -DURHO3D_TESTING=#{$testing}" or abort 'Failed to configure temporary project using Urho3D as external library'
-  xcode_build(ENV['IOS'], "../Build/generated/UsingSourceAndBuildTrees/Scaffolding.xcodeproj") or abort 'Failed to configure/build/test temporary project using Urho3D as external library'
+  xcode_build(ENV['IOS'], '../Build/Urho3D.xcodeproj') or abort 'Failed to build or test Urho3D library'
+  # Create a new project on the fly that uses newly built Urho3D library in the build tree
+  scaffolding "../Build/generated/UsingBuildTree"
+  system "export URHO3D_HOME=../.. && cd ../Build/generated/UsingBuildTree && echo '\nExternal project referencing Urho3D library in its build tree' && ./cmake_macosx.sh . -DIOS=$IOS #{deployment_target} #{$build_options} -DURHO3D_LUA#{jit}=1 -DURHO3D_TESTING=#{$testing}" or abort 'Failed to configure temporary project using Urho3D as external library'
+  xcode_build(ENV['IOS'], '../Build/generated/UsingBuildTree/Scaffolding.xcodeproj') or abort 'Failed to build/test temporary project using Urho3D as external library'
+  puts "\nInstalling Urho3 SDK...\n"
+  # Create a new project on the fly that uses newly installed Urho3D SDK
+  scaffolding "../Build/generated/UsingSDK"
+  xcode_build(ENV['IOS'], '../Build/Urho3D.xcodeproj', 'install', '>/dev/null') or abort 'Failed to install Urho3D SDK'
+  system "export URHO3D_HOME=~/usr/local && cd ../Build/generated/UsingSDK && echo '\nExternal project referencing Urho3D SDK' && ./cmake_macosx.sh . -DIOS=$IOS #{deployment_target} #{$build_options} -DURHO3D_LUA#{jit}=1 -DURHO3D_TESTING=#{$testing}" or abort 'Failed to configure temporary project using Urho3D as external library'
+  xcode_build(ENV['IOS'], '../Build/generated/UsingSDK/Scaffolding.xcodeproj') or abort 'Failed to build/test temporary project using Urho3D as external library'
 end
 
 def xcode_build(ios, project, target = 'ALL_BUILD', extras = '')
@@ -550,11 +556,11 @@ end
 
 def setup_digital_keys
   system 'mkdir -p ~/.ssh && chmod 700 ~/.ssh' or abort 'Failed to create ~/.ssh directory'
-  system "cat <<EOF >>~/.ssh/known_hosts
+  system 'cat <<EOF >>~/.ssh/known_hosts
 frs.sourceforge.net,216.34.181.57 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2uifHZbNexw6cXbyg1JnzDitL5VhYs0E65Hk/tLAPmcmm5GuiGeUoI/B0eUSNFsbqzwgwrttjnzKMKiGLN5CWVmlN1IXGGAfLYsQwK6wAu7kYFzkqP4jcwc5Jr9UPRpJdYIK733tSEmzab4qc5Oq8izKQKIaxXNe7FgmL15HjSpatFt9w/ot/CHS78FUAr3j3RwekHCm/jhPeqhlMAgC+jUgNJbFt3DlhDaRMa0NYamVzmX8D47rtmBbEDU3ld6AezWBPUR5Lh7ODOwlfVI58NAf/aYNlmvl2TZiauBCTa7OPYSyXJnIPbQXg6YQlDknNCr0K769EjeIlAfY87Z4tw==
-EOF" or abort 'Failed to append frs.sourceforge.net server public key to known_hosts'
+EOF' or abort 'Failed to append frs.sourceforge.net server public key to known_hosts'
   # Workaround travis encryption key size limitation. Rather than using the solution in their FAQ (using AES to encrypt/decrypt the file and check in the encrypted file into repo), our solution is more pragmatic. The private key below is incomplete. Only the missing portion is encrypted. Much less secure than the original 2048-bit RSA has to offer but good enough for our case. 
-  system "cat <<EOF >~/.ssh/id_rsa
+  system 'cat <<EOF >~/.ssh/id_rsa
 -----BEGIN RSA PRIVATE KEY-----
 MIIEpQIBAAKCAQEAnZGzFEypdXKY3KDT0Q3NLY4Bv74yKgJ4LIgbXothx8w4CfM0
 VeWBL/AE2iRISEWGB07LruM9y+U/wt58WlCVu001GuJuvXwWenlljsvH8qQlErYi
@@ -582,7 +588,7 @@ cl9eTLchxLGr15b5SOeNrQ1TCO4qZM3M6Wgv+bRI0h2JW+c0ABpTIBzehOvXcwZq
 32a54xZxlsBw8T5P4BDy40OR7fu+6miUfL+WxUdII4fD3grlIPw6bpNE0bCDykv5
 RLq28S11hDrKf/ZetXNuIprfTlhl6ISBy+oWQibhXmFZSxEiXNV6hCQ=
 -----END RSA PRIVATE KEY-----
-EOF" or abort 'Failed to create user private key to id_rsa'
+EOF' or abort 'Failed to create user private key to id_rsa'
   system 'chmod 600 ~/.ssh/id_rsa' or abort 'Failed to change id_rsa file permission'
 end
 

Source/CMakeLists.txt

@@ -42,7 +42,7 @@ if (NOT WIN32 AND NOT ANDROID)
         set (ORIGIN $ORIGIN)
     endif ()
     # When installing/packaging set the first RPATH entry to the library location relative to the executable
-    set (CMAKE_INSTALL_RPATH ${ORIGIN}/../../../lib${LIB_SUFFIX}${PATH_SUFFIX})    # The library location is based on SDK install destination
+    set (CMAKE_INSTALL_RPATH ${ORIGIN}/../../../lib${LIB_SUFFIX}/${PATH_SUFFIX})    # The library location is based on SDK install destination
     # The second entry to the install destination of the library, if the destination location is not in the system default search path
     list (FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} isSystemDir)
     if (isSystemDir STREQUAL -1)

Source/Extras/OgreBatchConverter/OgreBatchConverter.cpp

@@ -1,9 +1,9 @@
 // OgreBatchConverter.cpp : Defines the entry point for the console application.
 //
 
-#include "Context.h"
-#include "FileSystem.h"
-#include "ProcessUtils.h"
+#include <Urho3D/Context.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/ProcessUtils.h>
 
 #include <stdio.h>
 

Source/Samples/01_HelloWorld/HelloWorld.cpp

@@ -20,17 +20,17 @@
 // THE SOFTWARE.
 //
 
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Input.h"
-#include "ProcessUtils.h"
-#include "Text.h"
-#include "UI.h"
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
 
 #include "HelloWorld.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 // Expands to this example's entry-point
 DEFINE_APPLICATION_MAIN(HelloWorld)

Source/Samples/02_HelloGUI/HelloGUI.cpp

@@ -20,26 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include "Button.h"
-#include "BorderImage.h"
-#include "CheckBox.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "LineEdit.h"
-#include "ResourceCache.h"
-#include "Text.h"
-#include "Texture2D.h"
-#include "ToolTip.h"
-#include "UI.h"
-#include "UIElement.h"
-#include "UIEvents.h"
-#include "Window.h"
+#include <Urho3D/Button.h>
+#include <Urho3D/BorderImage.h>
+#include <Urho3D/CheckBox.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/LineEdit.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/Texture2D.h>
+#include <Urho3D/ToolTip.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/UIElement.h>
+#include <Urho3D/UIEvents.h>
+#include <Urho3D/Window.h>
 
 #include "HelloGUI.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(HelloGUI)
 

Source/Samples/03_Sprites/Sprites.cpp

@@ -20,17 +20,17 @@
 // THE SOFTWARE.
 //
 
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Graphics.h"
-#include "ResourceCache.h"
-#include "Sprite.h"
-#include "Texture2D.h"
-#include "UI.h"
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Sprite.h>
+#include <Urho3D/Texture2D.h>
+#include <Urho3D/UI.h>
 
 #include "Sprites.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 // Number of sprites to draw
 static const unsigned NUM_SPRITES = 100;

Source/Samples/04_StaticScene/StaticScene.cpp

@@ -20,25 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
 
 #include "StaticScene.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(StaticScene)
 

Source/Samples/05_AnimatingScene/AnimatingScene.cpp

@@ -20,27 +20,27 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Rotator.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "AnimatingScene.h"
+#include "Rotator.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(AnimatingScene)
 

Source/Samples/05_AnimatingScene/Rotator.cpp

@@ -20,11 +20,12 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Scene.h>
+#include <Urho3D/SceneEvents.h>
+
 #include "Rotator.h"
-#include "Scene.h"
-#include "SceneEvents.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 Rotator::Rotator(Context* context) :
     LogicComponent(context),

Source/Samples/05_AnimatingScene/Rotator.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "LogicComponent.h"
+#include <Urho3D/LogicComponent.h>
 
 // All Urho3D classes reside in namespace Urho3D
 using namespace Urho3D;

Source/Samples/06_SkeletalAnimation/Mover.cpp

@@ -20,13 +20,14 @@
 // THE SOFTWARE.
 //
 
-#include "AnimatedModel.h"
-#include "AnimationState.h"
+#include <Urho3D/AnimatedModel.h>
+#include <Urho3D/AnimationState.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/SceneEvents.h>
+
 #include "Mover.h"
-#include "Scene.h"
-#include "SceneEvents.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 Mover::Mover(Context* context) :
     LogicComponent(context),

Source/Samples/06_SkeletalAnimation/Mover.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "LogicComponent.h"
+#include <Urho3D/LogicComponent.h>
 
 using namespace Urho3D;
 

Source/Samples/06_SkeletalAnimation/SkeletalAnimation.cpp

@@ -20,31 +20,31 @@
 // THE SOFTWARE.
 //
 
-#include "Animation.h"
-#include "AnimatedModel.h"
-#include "AnimationState.h"
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "DebugRenderer.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Mover.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "Text.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/Animation.h>
+#include <Urho3D/AnimatedModel.h>
+#include <Urho3D/AnimationState.h>
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
+#include "Mover.h"
 #include "SkeletalAnimation.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(SkeletalAnimation)
 

Source/Samples/07_Billboards/Billboards.cpp

@@ -20,29 +20,29 @@
 // THE SOFTWARE.
 //
 
-#include "BillboardSet.h"
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "DebugRenderer.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/BillboardSet.h>
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "Billboards.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Billboards)
 

Source/Samples/08_Decals/Decals.cpp

@@ -20,31 +20,31 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Cursor.h"
-#include "DebugRenderer.h"
-#include "DecalSet.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "XMLFile.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Cursor.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/DecalSet.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/XMLFile.h>
+#include <Urho3D/Zone.h>
 
 #include "Decals.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Decals)
 

Source/Samples/09_MultipleViewports/MultipleViewports.cpp

@@ -20,31 +20,31 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Cursor.h"
-#include "DebugRenderer.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "RenderPath.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "XMLFile.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Cursor.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/RenderPath.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/XMLFile.h>
+#include <Urho3D/Zone.h>
 
 #include "MultipleViewports.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(MultipleViewports)
 

Source/Samples/10_RenderToTexture/RenderToTexture.cpp

@@ -20,30 +20,30 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "RenderSurface.h"
-#include "ResourceCache.h"
-#include "Rotator.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Technique.h"
-#include "Text.h"
-#include "Texture2D.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/RenderSurface.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Technique.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/Texture2D.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "RenderToTexture.h"
+#include "Rotator.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(RenderToTexture)
 

Source/Samples/10_RenderToTexture/Rotator.cpp

@@ -20,11 +20,12 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Scene.h>
+#include <Urho3D/SceneEvents.h>
+
 #include "Rotator.h"
-#include "Scene.h"
-#include "SceneEvents.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 Rotator::Rotator(Context* context) :
     LogicComponent(context),

Source/Samples/10_RenderToTexture/Rotator.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "LogicComponent.h"
+#include <Urho3D/LogicComponent.h>
 
 // All Urho3D classes reside in namespace Urho3D
 using namespace Urho3D;

Source/Samples/11_Physics/Physics.cpp

@@ -20,34 +20,34 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CollisionShape.h"
-#include "CoreEvents.h"
-#include "DebugRenderer.h"
-#include "Engine.h"
-#include "File.h"
-#include "FileSystem.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "PhysicsWorld.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "RigidBody.h"
-#include "Scene.h"
-#include "Skybox.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CollisionShape.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/File.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/PhysicsWorld.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/RigidBody.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Skybox.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "Physics.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Physics)
 

Source/Samples/12_PhysicsStressTest/PhysicsStressTest.cpp

@@ -20,33 +20,33 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CollisionShape.h"
-#include "CoreEvents.h"
-#include "DebugRenderer.h"
-#include "Engine.h"
-#include "File.h"
-#include "FileSystem.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "PhysicsWorld.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "RigidBody.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CollisionShape.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/File.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/PhysicsWorld.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/RigidBody.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "PhysicsStressTest.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(PhysicsStressTest)
 

Source/Samples/13_Ragdolls/CreateRagdoll.cpp

@@ -20,14 +20,15 @@
 // THE SOFTWARE.
 //
 
-#include "AnimatedModel.h"
+#include <Urho3D/AnimatedModel.h>
+#include <Urho3D/Log.h>
+#include <Urho3D/Node.h>
+#include <Urho3D/RigidBody.h>
+#include <Urho3D/PhysicsEvents.h>
+
 #include "CreateRagdoll.h"
-#include "Log.h"
-#include "Node.h"
-#include "RigidBody.h"
-#include "PhysicsEvents.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 CreateRagdoll::CreateRagdoll(Context* context) :
     Component(context)

Source/Samples/13_Ragdolls/CreateRagdoll.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "CollisionShape.h"
-#include "Constraint.h"
+#include <Urho3D/CollisionShape.h>
+#include <Urho3D/Constraint.h>
 
 using namespace Urho3D;
 

Source/Samples/13_Ragdolls/Ragdolls.cpp

@@ -20,34 +20,34 @@
 // THE SOFTWARE.
 //
 
-#include "AnimatedModel.h"
-#include "Camera.h"
-#include "CollisionShape.h"
-#include "CoreEvents.h"
-#include "CreateRagdoll.h"
-#include "DebugRenderer.h"
-#include "Engine.h"
-#include "File.h"
-#include "FileSystem.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "PhysicsWorld.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "RigidBody.h"
-#include "Scene.h"
-#include "Text.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/AnimatedModel.h>
+#include <Urho3D/Camera.h>
+#include <Urho3D/CollisionShape.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/File.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/PhysicsWorld.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/RigidBody.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
+#include "CreateRagdoll.h"
 #include "Ragdolls.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Ragdolls)
 

Source/Samples/14_SoundEffects/SoundEffects.cpp

@@ -20,24 +20,24 @@
 // THE SOFTWARE.
 //
 
-#include "Audio.h"
-#include "Button.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Input.h"
-#include "Log.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "Slider.h"
-#include "Sound.h"
-#include "SoundSource.h"
-#include "Text.h"
-#include "UI.h"
-#include "UIEvents.h"
+#include <Urho3D/Audio.h>
+#include <Urho3D/Button.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Log.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Slider.h>
+#include <Urho3D/Sound.h>
+#include <Urho3D/SoundSource.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/UIEvents.h>
 
 #include "SoundEffects.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 // Custom variable identifier for storing sound effect name within the UI element
 static const StringHash VAR_SOUNDRESOURCE("SoundResource");

Source/Samples/15_Navigation/Navigation.cpp

@@ -20,33 +20,33 @@
 // THE SOFTWARE.
 //
 
-#include "AnimatedModel.h"
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Cursor.h"
-#include "DebugRenderer.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Navigable.h"
-#include "NavigationMesh.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "XMLFile.h"
-#include "Zone.h"
+#include <Urho3D/AnimatedModel.h>
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Cursor.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Navigable.h>
+#include <Urho3D/NavigationMesh.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/XMLFile.h>
+#include <Urho3D/Zone.h>
 
 #include "Navigation.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Navigation)
 

Source/Samples/16_Chat/Chat.cpp

@@ -20,30 +20,30 @@
 // THE SOFTWARE.
 //
 
-#include "Audio.h"
-#include "Button.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "IOEvents.h"
-#include "LineEdit.h"
-#include "Log.h"
-#include "MemoryBuffer.h"
-#include "Network.h"
-#include "NetworkEvents.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "Sound.h"
-#include "Text.h"
-#include "UI.h"
-#include "UIEvents.h"
-#include "VectorBuffer.h"
-#include "Zone.h"
+#include <Urho3D/Audio.h>
+#include <Urho3D/Button.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/IOEvents.h>
+#include <Urho3D/LineEdit.h>
+#include <Urho3D/Log.h>
+#include <Urho3D/MemoryBuffer.h>
+#include <Urho3D/Network.h>
+#include <Urho3D/NetworkEvents.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Sound.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/UIEvents.h>
+#include <Urho3D/VectorBuffer.h>
+#include <Urho3D/Zone.h>
 
 #include "Chat.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 // Undefine Windows macro, as our Connection class has a function called SendMessage
 #ifdef SendMessage

Source/Samples/17_SceneReplication/SceneReplication.cpp

@@ -20,41 +20,41 @@
 // THE SOFTWARE.
 //
 
-#include "Button.h"
-#include "Camera.h"
-#include "CollisionShape.h"
-#include "Connection.h"
-#include "Controls.h"
-#include "CoreEvents.h"
-#include "Cursor.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Light.h"
-#include "LineEdit.h"
-#include "Log.h"
-#include "Material.h"
-#include "Model.h"
-#include "Network.h"
-#include "NetworkEvents.h"
-#include "Octree.h"
-#include "PhysicsEvents.h"
-#include "PhysicsWorld.h"
-#include "Renderer.h"
-#include "RigidBody.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "UIEvents.h"
-#include "XMLFile.h"
-#include "Zone.h"
+#include <Urho3D/Button.h>
+#include <Urho3D/Camera.h>
+#include <Urho3D/CollisionShape.h>
+#include <Urho3D/Connection.h>
+#include <Urho3D/Controls.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Cursor.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/LineEdit.h>
+#include <Urho3D/Log.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Network.h>
+#include <Urho3D/NetworkEvents.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/PhysicsEvents.h>
+#include <Urho3D/PhysicsWorld.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/RigidBody.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/UIEvents.h>
+#include <Urho3D/XMLFile.h>
+#include <Urho3D/Zone.h>
 
 #include "SceneReplication.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 // UDP port we will use
 static const unsigned short SERVER_PORT = 2345;

Source/Samples/18_CharacterDemo/Character.cpp

@@ -20,15 +20,16 @@
 // THE SOFTWARE.
 //
 
-#include "AnimationController.h"
+#include <Urho3D/AnimationController.h>
+#include <Urho3D/Context.h>
+#include <Urho3D/MemoryBuffer.h>
+#include <Urho3D/PhysicsEvents.h>
+#include <Urho3D/PhysicsWorld.h>
+#include <Urho3D/RigidBody.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/SceneEvents.h>
+
 #include "Character.h"
-#include "Context.h"
-#include "MemoryBuffer.h"
-#include "PhysicsEvents.h"
-#include "PhysicsWorld.h"
-#include "RigidBody.h"
-#include "Scene.h"
-#include "SceneEvents.h"
 
 Character::Character(Context* context) :
     LogicComponent(context),

Source/Samples/18_CharacterDemo/Character.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "Controls.h"
-#include "LogicComponent.h"
+#include <Urho3D/Controls.h>
+#include <Urho3D/LogicComponent.h>
 
 using namespace Urho3D;
 

Source/Samples/18_CharacterDemo/CharacterDemo.cpp

@@ -20,36 +20,36 @@
 // THE SOFTWARE.
 //
 
-#include "AnimatedModel.h"
-#include "AnimationController.h"
-#include "Camera.h"
-#include "CollisionShape.h"
-#include "Controls.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "FileSystem.h"
-#include "Font.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "PhysicsWorld.h"
-#include "ProcessUtils.h"
-#include "Renderer.h"
-#include "RigidBody.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/AnimatedModel.h>
+#include <Urho3D/AnimationController.h>
+#include <Urho3D/Camera.h>
+#include <Urho3D/CollisionShape.h>
+#include <Urho3D/Controls.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/PhysicsWorld.h>
+#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/RigidBody.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "Character.h"
 #include "CharacterDemo.h"
 #include "Touch.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(CharacterDemo)
 

Source/Samples/18_CharacterDemo/Touch.cpp

@@ -20,10 +20,10 @@
 // THE SOFTWARE.
 //
 
-#include "Controls.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Renderer.h"
+#include <Urho3D/Controls.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Renderer.h>
 
 #include "Character.h"
 #include "Touch.h"

Source/Samples/18_CharacterDemo/Touch.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Object.h"
+#include <Urho3D/Object.h>
 
 using namespace Urho3D;
 

Source/Samples/19_VehicleDemo/Vehicle.cpp

@@ -20,17 +20,18 @@
 // THE SOFTWARE.
 //
 
-#include "CollisionShape.h"
-#include "Constraint.h"
-#include "Context.h"
-#include "Material.h"
-#include "Model.h"
-#include "PhysicsEvents.h"
-#include "PhysicsWorld.h"
-#include "ResourceCache.h"
-#include "RigidBody.h"
-#include "Scene.h"
-#include "StaticModel.h"
+#include <Urho3D/CollisionShape.h>
+#include <Urho3D/Constraint.h>
+#include <Urho3D/Context.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/PhysicsEvents.h>
+#include <Urho3D/PhysicsWorld.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/RigidBody.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+
 #include "Vehicle.h"
 
 Vehicle::Vehicle(Context* context) :

Source/Samples/19_VehicleDemo/Vehicle.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "Controls.h"
-#include "LogicComponent.h"
+#include <Urho3D/Controls.h>
+#include <Urho3D/LogicComponent.h>
 
 namespace Urho3D
 {

Source/Samples/19_VehicleDemo/VehicleDemo.cpp

@@ -20,34 +20,34 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CollisionShape.h"
-#include "Constraint.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "FileSystem.h"
-#include "Font.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "PhysicsWorld.h"
-#include "ProcessUtils.h"
-#include "Renderer.h"
-#include "RigidBody.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Terrain.h"
-#include "Text.h"
-#include "UI.h"
-#include "Vehicle.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CollisionShape.h>
+#include <Urho3D/Constraint.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/PhysicsWorld.h>
+#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/RigidBody.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Terrain.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
+#include "Vehicle.h"
 #include "VehicleDemo.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 const float CAMERA_DISTANCE = 10.0f;
 

Source/Samples/20_HugeObjectCount/HugeObjectCount.cpp

@@ -20,27 +20,27 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Profiler.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModelGroup.h"
-#include "Text.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Profiler.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModelGroup.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "HugeObjectCount.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(HugeObjectCount)
 

Source/Samples/21_AngelScriptIntegration/AngelScriptIntegration.cpp

@@ -20,29 +20,29 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "Script.h"
-#include "ScriptFile.h"
-#include "ScriptInstance.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Script.h>
+#include <Urho3D/ScriptFile.h>
+#include <Urho3D/ScriptInstance.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "AngelScriptIntegration.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(AngelScriptIntegration)
 

Source/Samples/22_LuaIntegration/LuaIntegration.cpp

@@ -20,30 +20,30 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "LuaFile.h"
-#include "LuaFunction.h"
-#include "LuaScript.h"
-#include "LuaScriptInstance.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/LuaFile.h>
+#include <Urho3D/LuaFunction.h>
+#include <Urho3D/LuaScript.h>
+#include <Urho3D/LuaScriptInstance.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "LuaIntegration.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(LuaIntegration)
 

Source/Samples/23_Water/Water.cpp

@@ -20,33 +20,33 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "File.h"
-#include "FileSystem.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "RenderSurface.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "Skybox.h"
-#include "StaticModel.h"
-#include "Terrain.h"
-#include "Text.h"
-#include "Texture2D.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/File.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/RenderSurface.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Skybox.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Terrain.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/Texture2D.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "Water.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Water)
 

Source/Samples/23_Water/Water.h

@@ -22,7 +22,8 @@
 
 #pragma once
 
-#include "Plane.h"
+#include <Urho3D/Plane.h>
+
 #include "Sample.h"
 
 namespace Urho3D

Source/Samples/24_Urho2DSprite/Urho2DSprite.cpp

@@ -20,25 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include "AnimatedSprite2D.h"
-#include "AnimationSet2D.h"
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "Sprite2D.h"
-#include "StaticSprite2D.h"
-#include "Text.h"
+#include <Urho3D/AnimatedSprite2D.h>
+#include <Urho3D/AnimationSet2D.h>
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Sprite2D.h>
+#include <Urho3D/StaticSprite2D.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/Zone.h>
+
 #include "Urho2DSprite.h"
-#include "Zone.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 // Number of static sprites to draw
 static const unsigned NUM_SPRITES = 200;

Source/Samples/25_Urho2DParticle/Urho2DParticle.cpp

@@ -20,24 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "InputEvents.h"
-#include "Octree.h"
-#include "ParticleEmitter2D.h"
-#include "ParticleEffect2D.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "Text.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/InputEvents.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/ParticleEmitter2D.h>
+#include <Urho3D/ParticleEffect2D.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/Zone.h>
+
 #include "Urho2DParticle.h"
-#include "Zone.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Urho2DParticle)
 

Source/Samples/26_ConsoleInput/ConsoleInput.cpp

@@ -20,20 +20,20 @@
 // THE SOFTWARE.
 //
 
-#include "Button.h"
-#include "Console.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "EngineEvents.h"
-#include "Input.h"
-#include "Log.h"
-#include "ProcessUtils.h"
-#include "Random.h"
-#include "Timer.h"
+#include <Urho3D/Button.h>
+#include <Urho3D/Console.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/EngineEvents.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Log.h>
+#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/Random.h>
+#include <Urho3D/Timer.h>
 
 #include "ConsoleInput.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 // Expands to this example's entry-point
 DEFINE_APPLICATION_MAIN(ConsoleInput)

Source/Samples/27_Urho2DPhysics/Urho2DPhysics.cpp

@@ -20,29 +20,30 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CollisionBox2D.h"
-#include "CollisionCircle2D.h"
-#include "CoreEvents.h"
-#include "DebugRenderer.h"
-#include "Drawable2D.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Octree.h"
-#include "PhysicsWorld2D.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "RigidBody2D.h"
-#include "Scene.h"
-#include "SceneEvents.h"
-#include "Sprite2D.h"
-#include "StaticSprite2D.h"
-#include "Text.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CollisionBox2D.h>
+#include <Urho3D/CollisionCircle2D.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/Drawable2D.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/PhysicsWorld2D.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/RigidBody2D.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/SceneEvents.h>
+#include <Urho3D/Sprite2D.h>
+#include <Urho3D/StaticSprite2D.h>
+#include <Urho3D/Text.h>
+
 #include "Urho2DPhysics.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Urho2DPhysics)
 

Source/Samples/28_Urho2DPhysicsRope/Urho2DPhysicsRope.cpp

@@ -20,27 +20,28 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CollisionBox2D.h"
-#include "CollisionEdge2D.h"
-#include "ConstraintRevolute2D.h"
-#include "ConstraintRope2D.h"
-#include "CoreEvents.h"
-#include "DebugRenderer.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Octree.h"
-#include "PhysicsWorld2D.h"
-#include "Renderer.h"
-#include "RigidBody2D.h"
-#include "Scene.h"
-#include "SceneEvents.h"
-#include "Text.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CollisionBox2D.h>
+#include <Urho3D/CollisionEdge2D.h>
+#include <Urho3D/ConstraintRevolute2D.h>
+#include <Urho3D/ConstraintRope2D.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/PhysicsWorld2D.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/RigidBody2D.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/SceneEvents.h>
+#include <Urho3D/Text.h>
+
 #include "Urho2DPhysicsRope.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Urho2DPhysicsRope)
 

Source/Samples/29_SoundSynthesis/SoundSynthesis.cpp

@@ -20,20 +20,20 @@
 // THE SOFTWARE.
 //
 
-#include "BufferedSoundStream.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Input.h"
-#include "Log.h"
-#include "Node.h"
-#include "SoundSource.h"
-#include "Text.h"
-#include "UI.h"
+#include <Urho3D/BufferedSoundStream.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Log.h>
+#include <Urho3D/Node.h>
+#include <Urho3D/SoundSource.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
 
 #include "SoundSynthesis.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 // Expands to this example's entry-point
 DEFINE_APPLICATION_MAIN(SoundSynthesis)

Source/Samples/30_LightAnimation/LightAnimation.cpp

@@ -20,27 +20,28 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
+#include <Urho3D/Animatable.h>
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/ObjectAnimation.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/ValueAnimation.h>
+
 #include "LightAnimation.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "ObjectAnimation.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "UI.h"
-#include "ValueAnimation.h"
-
-#include "DebugNew.h"
-#include "Animatable.h"
+
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(LightAnimation)
 

Source/Samples/31_MaterialAnimation/MaterialAnimation.cpp

@@ -20,26 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "ValueAnimation.h"
-#include "UI.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/ValueAnimation.h>
+#include <Urho3D/UI.h>
 
 #include "MaterialAnimation.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(MaterialAnimation)
 

Source/Samples/32_Urho2DConstraints/Urho2DConstraints.cpp

@@ -20,45 +20,46 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CollisionBox2D.h"
-#include "CollisionCircle2D.h"
-#include "CollisionEdge2D.h"
-#include "CollisionPolygon2D.h"
-#include "ConstraintDistance2D.h"
-#include "ConstraintFriction2D.h"
-#include "ConstraintGear2D.h"
-#include "ConstraintMotor2D.h"
-#include "ConstraintMouse2D.h"
-#include "ConstraintPrismatic2D.h"
-#include "ConstraintPulley2D.h"
-#include "ConstraintRevolute2D.h"
-#include "ConstraintRope2D.h"
-#include "ConstraintWeld2D.h"
-#include "ConstraintWheel2D.h"
-#include "CoreEvents.h"
-#include "DebugNew.h"
-#include "DebugRenderer.h"
-#include "Drawable2D.h"
-#include "Engine.h"
-#include "FileSystem.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Octree.h"
-#include "PhysicsWorld2D.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "RigidBody2D.h"
-#include "Scene.h"
-#include "SceneEvents.h"
-#include "Sprite2D.h"
-#include "StaticSprite2D.h"
-#include "Text.h"
-#include "Text3D.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CollisionBox2D.h>
+#include <Urho3D/CollisionCircle2D.h>
+#include <Urho3D/CollisionEdge2D.h>
+#include <Urho3D/CollisionPolygon2D.h>
+#include <Urho3D/ConstraintDistance2D.h>
+#include <Urho3D/ConstraintFriction2D.h>
+#include <Urho3D/ConstraintGear2D.h>
+#include <Urho3D/ConstraintMotor2D.h>
+#include <Urho3D/ConstraintMouse2D.h>
+#include <Urho3D/ConstraintPrismatic2D.h>
+#include <Urho3D/ConstraintPulley2D.h>
+#include <Urho3D/ConstraintRevolute2D.h>
+#include <Urho3D/ConstraintRope2D.h>
+#include <Urho3D/ConstraintWeld2D.h>
+#include <Urho3D/ConstraintWheel2D.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/DebugNew.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/Drawable2D.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/PhysicsWorld2D.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/RigidBody2D.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/SceneEvents.h>
+#include <Urho3D/Sprite2D.h>
+#include <Urho3D/StaticSprite2D.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/Text3D.h>
+#include <Urho3D/Vector.h>
+#include <Urho3D/Zone.h>
+
 #include "Urho2DConstraints.h"
-#include "Vector.h"
-#include "Zone.h"
 
 DEFINE_APPLICATION_MAIN(Urho2DConstraints)
 

Source/Samples/33_Urho2DSpriterAnimation/Urho2DSpriterAnimation.cpp

@@ -20,24 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include "AnimatedSprite2D.h"
-#include "AnimationSet2D.h"
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Drawable2D.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "Text.h"
+#include <Urho3D/AnimatedSprite2D.h>
+#include <Urho3D/AnimationSet2D.h>
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Drawable2D.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/Zone.h>
+
 #include "Urho2DSpriterAnimation.h"
-#include "Zone.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 static const char* animationNames[] =
 {

Source/Samples/34_DynamicGeometry/DynamicGeometry.cpp

@@ -20,31 +20,31 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Geometry.h"
-#include "Graphics.h"
-#include "IndexBuffer.h"
-#include "Input.h"
-#include "Light.h"
-#include "Log.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Profiler.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "VertexBuffer.h"
-#include "UI.h"
-#include "Zone.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Geometry.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/IndexBuffer.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Log.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Profiler.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/VertexBuffer.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/Zone.h>
 
 #include "DynamicGeometry.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(DynamicGeometry)
 

Source/Samples/35_SignedDistanceFieldText/SignedDistanceFieldText.cpp

@@ -20,26 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StaticModel.h"
-#include "Text.h"
-#include "Text3D.h"
-#include "UI.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StaticModel.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/Text3D.h>
+#include <Urho3D/UI.h>
 
 #include "SignedDistanceFieldText.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(SignedDistanceFieldText)
 

Source/Samples/36_Urho2DTileMap/Urho2DTileMap.cpp

@@ -20,28 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "Text.h"
-#include "Urho2DTileMap.h"
-#include "Zone.h"
-#include "TmxFile2D.h"
-#include "TileMap2D.h"
-#include "Drawable2D.h"
+#include <Urho3D/Camera.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/Octree.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/Zone.h>
+#include <Urho3D/TmxFile2D.h>
+#include <Urho3D/TileMap2D.h>
+#include <Urho3D/Drawable2D.h>
 
-#include "DebugNew.h"
+#include "Urho2DTileMap.h"
 
-// Number of static sprites to draw
-static const StringHash VAR_MOVESPEED("MoveSpeed");
-static const StringHash VAR_ROTATESPEED("RotateSpeed");
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Urho2DTileMap)
 

Source/Samples/37_UIDrag/UIDrag.cpp

@@ -20,29 +20,15 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Button.h>
+#include <Urho3D/CoreEvents.h>
+#include <Urho3D/Font.h>
+#include <Urho3D/Text.h>
+#include <Urho3D/UIEvents.h>
+
 #include "UIDrag.h"
 
-#include "Camera.h"
-#include "CoreEvents.h"
-#include "Engine.h"
-#include "Font.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "Octree.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "Zone.h"
-#include "Drawable2D.h"
-#include "Log.h"
-
-#include "UIEvents.h"
-#include "Text.h"
-#include "UIElement.h"
-#include "Button.h"
-
-#include "DebugNew.h"
-#include "Log.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(UIDrag)
 

Source/Samples/Sample.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Application.h"
+#include <Urho3D/Application.h>
 
 namespace Urho3D
 {

Source/Samples/Sample.inl

@@ -20,25 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include "Application.h"
-#include "Camera.h"
-#include "Console.h"
-#include "Cursor.h"
-#include "DebugHud.h"
-#include "Engine.h"
-#include "FileSystem.h"
-#include "Graphics.h"
-#include "Input.h"
-#include "InputEvents.h"
-#include "Renderer.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "SceneEvents.h"
-#include "Sprite.h"
-#include "Texture2D.h"
-#include "Timer.h"
-#include "UI.h"
-#include "XMLFile.h"
+#include <Urho3D/Application.h>
+#include <Urho3D/Camera.h>
+#include <Urho3D/Console.h>
+#include <Urho3D/Cursor.h>
+#include <Urho3D/DebugHud.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Input.h>
+#include <Urho3D/InputEvents.h>
+#include <Urho3D/Renderer.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/SceneEvents.h>
+#include <Urho3D/Sprite.h>
+#include <Urho3D/Texture2D.h>
+#include <Urho3D/Timer.h>
+#include <Urho3D/UI.h>
+#include <Urho3D/XMLFile.h>
 
 Sample::Sample(Context* context) :
     Application(context),

Source/ThirdParty/AngelScript/CMakeLists.txt

@@ -35,5 +35,5 @@ set (INCLUDE_DIRS_ONLY include)
 # Setup target
 setup_library ()
 
-# Install dependency for Engine/Script/APITemplates.h
+# Install dependency for Urho3D/Script/APITemplates.h
 install_header_files (DIRECTORY include/ DESTINATION ${DEST_INCLUDE_DIR}/AngelScript FILES_MATCHING PATTERN *.h)     # Note: the trailing slash is significant

Source/ThirdParty/Box2D/CMakeLists.txt

@@ -163,5 +163,5 @@ set (INCLUDE_DIRS_ONLY .)
 # Setup target
 setup_library ()
 
-# Install dependency for Engine/Urho2D/PhysicsWorld2D.h and Engine/Urho2D/RigidBody2D.h
+# Install dependency for Urho3D/Urho2D/PhysicsWorld2D.h and Urho3D/Urho2D/RigidBody2D.h
 install_header_files (DIRECTORY Box2D DESTINATION ${DEST_INCLUDE_DIR} FILES_MATCHING PATTERN *.h)

Source/ThirdParty/Bullet/CMakeLists.txt

@@ -24,5 +24,5 @@ set (INCLUDE_DIRS_ONLY src)
 # Setup target
 setup_library ()
 
-# Install dependency for Engine/Physics/PhysicsWorld.h and Engine/Physics/RigidBody.h
+# Install dependency for Urho3D/Physics/PhysicsWorld.h and Urho3D/Physics/RigidBody.h
 install_header_files (DIRECTORY src/ DESTINATION ${DEST_INCLUDE_DIR}/Bullet FILES_MATCHING PATTERN *.h)  # Note: the trailing slash is significant

Source/ThirdParty/SDL/CMakeLists.txt

@@ -119,6 +119,9 @@ set (INCLUDE_DIRS_ONLY include)
 # Setup target
 setup_library ()
 
-# Install dependency for SDL_android_main.c, D3D9GraphicsImpl.h, OGLGraphicsImpl.h, InputEvents.h, File.h, and Cursor.h
-install_header_files (DIRECTORY include/ DESTINATION ${DEST_INCLUDE_DIR}/SDL FILES_MATCHING PATTERN *.h)     # Note: the trailing slash is significant
-install_header_files (FILES src/main/android/SDL_android_main.c DESTINATION ${DEST_INCLUDE_DIR})    # Intentionally install this C file in include dir
+# Install dependency for D3D9GraphicsImpl.h, OGLGraphicsImpl.h, InputEvents.h, File.h, and Cursor.h
+install_header_files (DIRECTORY include/ DESTINATION ${DEST_INCLUDE_DIR}/SDL FILES_MATCHING PATTERN *.h USE_FILE_SYMLINK)    # Note: the trailing slash is significant
+# Install dependency for SDL_android_main.c
+install_header_files (DIRECTORY src/main/android DESTINATION ${DEST_INCLUDE_DIR}/SDL)
+install_header_files (FILES src/SDL_internal.h DESTINATION ${DEST_INCLUDE_DIR}/SDL)
+install_header_files (DIRECTORY src/dynapi DESTINATION ${DEST_INCLUDE_DIR}/SDL FILES_MATCHING PATTERN *.h)

Source/ThirdParty/SDL/src/main/android/SDL_android_main.c

@@ -1,12 +1,16 @@
 /*
     SDL_android_main.c, placed in the public domain by Sam Lantinga  3/13/14
 */
-#include "../../SDL_internal.h"
+
+// Modified by Lasse Oorni and Yao Wei Tjong for Urho3D
+
+// Urho3D - use SDK include dir
+#include <SDL/SDL_internal.h>
 
 #ifdef __ANDROID__
 
-/* Include the SDL main definition header */
-#include "SDL_main.h"
+/* Include the SDL main definition header */ // Urho3D - use SDK include dir
+#include <SDL/SDL_main.h>
 
 /*******************************************************************************
                  Functions called by JNI

Source/ThirdParty/kNet/CMakeLists.txt

@@ -65,5 +65,5 @@ set (INCLUDE_DIRS_ONLY include)
 # Setup target
 setup_library ()
 
-# Install dependency for Engine/Network/Connection.h and Engine/Network/Network.h
+# Install dependency for Urho3D/Network/Connection.h and Urho3D/Network/Network.h
 install_header_files (DIRECTORY include/ DESTINATION ${DEST_INCLUDE_DIR}/kNet FILES_MATCHING PATTERN *.h *.inl)     # Note: the trailing slash is significant

Source/ThirdParty/kNet/include/kNet/IMessageHandler.h

@@ -16,7 +16,10 @@
 /** @file IMessageHandler.h
 	@brief The \ref kNet::IMessageHandler IMessageHandler interface. Implementable by the client application. */
 
-#include "kNet/Types.h"
+// Modified by Yao Wei Tjong for Urho3D
+
+// Urho3D: use relative path
+#include "Types.h"
 
 namespace kNet
 {

Source/ThirdParty/kNet/include/kNet/INetworkServerListener.h

@@ -16,7 +16,10 @@
 /** @file INetworkServerListener.h
 	@brief The \ref kNet::INetworkServerListener INetworkServerListener interface. Implementable by the client application. */
 
-#include "kNet/Types.h"
+// Modified by Yao Wei Tjong for Urho3D
+
+// Urho3D: use relative path
+#include "Types.h"
 
 namespace kNet
 {

Source/ThirdParty/kNet/include/kNet/SharedPtr.h

@@ -16,6 +16,8 @@
 /** @file SharedPtr.h
 	@brief SharedPtr, intrusive reference counting for multiple pointer owners. */
 
+// Modified by Yao Wei Tjong for Urho3D
+
 #include <cstdlib>
 #include <cassert>
 
@@ -131,5 +133,6 @@ bool operator==(const SharedPtr<T> &a, const SharedPtr<T> &b)
 
 } // ~kNet
 
-#include "kNet/SharedPtr.inl"
+// Urho3D: use relative path
+#include "SharedPtr.inl"
 

Source/ThirdParty/kNet/include/kNet/Types.h

@@ -16,6 +16,8 @@
 /** @file Types.h
 	@brief Provides platform-independent fixed size types. */
 
+// Modified by Yao Wei Tjong for Urho3D
+
 // Preprocessor macro for suppressing unused formal parameter warnings while still showing the variable name in Doxygen documentation.
 #if defined(DOXYGEN) // DOXYGEN is a special define used when Doxygen is run.
 #define UNUSED(x) x
@@ -25,7 +27,8 @@
 
 #ifndef KNET_NO_FIXEDWIDTH_TYPES
 
-#include "kNetBuildConfig.h"
+// Urho3D: use relative path
+#include "../kNetBuildConfig.h"
 
 #ifdef __MINGW32__
 #include <stdint.h>

Source/Tools/AssetImporter/AssetImporter.cpp

@@ -20,34 +20,34 @@
 // THE SOFTWARE.
 //
 
-#include "AnimatedModel.h"
-#include "Animation.h"
-#include "Context.h"
-#include "DebugRenderer.h"
-#include "File.h"
-#include "FileSystem.h"
-#include "Geometry.h"
-#include "Graphics.h"
-#include "IndexBuffer.h"
-#include "Light.h"
-#include "Material.h"
-#include "Model.h"
-#include "Octree.h"
+#include <Urho3D/AnimatedModel.h>
+#include <Urho3D/Animation.h>
+#include <Urho3D/Context.h>
+#include <Urho3D/DebugRenderer.h>
+#include <Urho3D/File.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Geometry.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/IndexBuffer.h>
+#include <Urho3D/Light.h>
+#include <Urho3D/Material.h>
+#include <Urho3D/Model.h>
+#include <Urho3D/Octree.h>
 #ifdef URHO3D_PHYSICS
-#include "PhysicsWorld.h"
+#include <Urho3D/PhysicsWorld.h>
 #endif
-#include "ProcessUtils.h"
-#include "Quaternion.h"
-#include "ResourceCache.h"
-#include "Scene.h"
-#include "StringUtils.h"
-#include "Vector3.h"
-#include "VertexBuffer.h"
-#include "WorkQueue.h"
-#include "XMLFile.h"
-#include "Zone.h"
-
-#include "Sort.h"
+#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/Quaternion.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Scene.h>
+#include <Urho3D/StringUtils.h>
+#include <Urho3D/Vector3.h>
+#include <Urho3D/VertexBuffer.h>
+#include <Urho3D/WorkQueue.h>
+#include <Urho3D/XMLFile.h>
+#include <Urho3D/Zone.h>
+
+#include <Urho3D/Sort.h>
 
 #ifdef WIN32
 #include <windows.h>
@@ -60,7 +60,7 @@
 
 #include <cstring>
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 using namespace Urho3D;
 

Source/Tools/OgreImporter/OgreImporter.cpp

@@ -20,15 +20,16 @@
 // THE SOFTWARE.
 //
 
-#include "Context.h"
-#include "File.h"
-#include "FileSystem.h"
-#include "HashSet.h"
+#include <Urho3D/Context.h>
+#include <Urho3D/File.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/HashSet.h>
+#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/Sort.h>
+#include <Urho3D/Tangent.h>
+#include <Urho3D/XMLFile.h>
+
 #include "OgreImporterUtils.h"
-#include "ProcessUtils.h"
-#include "Sort.h"
-#include "Tangent.h"
-#include "XMLFile.h"
 
 #ifdef WIN32
 #include <windows.h>
@@ -37,7 +38,7 @@
 #include <cstddef>
 #include <cstring>
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 static const int VERTEX_CACHE_SIZE = 32;
 

Source/Tools/OgreImporter/OgreImporterUtils.h

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include "Animation.h"
-#include "BoundingBox.h"
-#include "Graphics.h"
-#include "Serializer.h"
-#include "Matrix3x4.h"
+#include <Urho3D/Animation.h>
+#include <Urho3D/BoundingBox.h>
+#include <Urho3D/Graphics.h>
+#include <Urho3D/Serializer.h>
+#include <Urho3D/Matrix3x4.h>
 
 using namespace Urho3D;
 

Source/Tools/PackageTool/PackageTool.cpp

@@ -20,11 +20,11 @@
 // THE SOFTWARE.
 //
 
-#include "Context.h"
-#include "ArrayPtr.h"
-#include "File.h"
-#include "FileSystem.h"
-#include "ProcessUtils.h"
+#include <Urho3D/Context.h>
+#include <Urho3D/ArrayPtr.h>
+#include <Urho3D/File.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/ProcessUtils.h>
 
 #ifdef WIN32
 #include <windows.h>
@@ -35,7 +35,7 @@
 #include <lz4.h>
 #include <lz4hc.h>
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 using namespace Urho3D;
 

Source/Tools/RampGenerator/RampGenerator.cpp

@@ -20,10 +20,10 @@
 // THE SOFTWARE.
 //
 
-#include "ArrayPtr.h"
-#include "MathDefs.h"
-#include "ProcessUtils.h"
-#include "StringUtils.h"
+#include <Urho3D/ArrayPtr.h>
+#include <Urho3D/MathDefs.h>
+#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/StringUtils.h>
 
 #ifdef WIN32
 #include <windows.h>
@@ -32,7 +32,7 @@
 #include <stb_image.h>
 #include <stb_image_write.h>
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 using namespace Urho3D;
 

Source/Tools/ScriptCompiler/ScriptCompiler.cpp

@@ -20,25 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include "Context.h"
-#include "Engine.h"
-#include "File.h"
-#include "FileSystem.h"
-#include "Log.h"
-#include "ProcessUtils.h"
-#include "ResourceCache.h"
-#include "Script.h"
-#include "ScriptFile.h"
+#include <Urho3D/Context.h>
+#include <Urho3D/Engine.h>
+#include <Urho3D/File.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Log.h>
+#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/Script.h>
+#include <Urho3D/ScriptFile.h>
 
 #ifdef URHO3D_LUA
-#include "LuaScript.h"
+#include <Urho3D/LuaScript.h>
 #endif
 
 #ifdef WIN32
 #include <windows.h>
 #endif
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 using namespace Urho3D;
 

Source/Tools/Urho3DPlayer/Urho3DPlayer.cpp

@@ -20,26 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include "Engine.h"
-#include "FileSystem.h"
-#include "Log.h"
-#include "Main.h"
-#include "ProcessUtils.h"
-#include "ResourceCache.h"
-#include "ResourceEvents.h"
+#include <Urho3D/Engine.h>
+#include <Urho3D/FileSystem.h>
+#include <Urho3D/Log.h>
+#include <Urho3D/Main.h>
+#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/ResourceCache.h>
+#include <Urho3D/ResourceEvents.h>
 
 #ifdef URHO3D_ANGELSCRIPT
-#include "ScriptFile.h"
-#include "Script.h"
+#include <Urho3D/ScriptFile.h>
+#include <Urho3D/Script.h>
 #endif
 
 #ifdef URHO3D_LUA
-#include "LuaScript.h"
+#include <Urho3D/LuaScript.h>
 #endif
 
 #include "Urho3DPlayer.h"
 
-#include "DebugNew.h"
+#include <Urho3D/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Urho3DPlayer);
 

Source/Tools/Urho3DPlayer/Urho3DPlayer.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Application.h"
+#include <Urho3D/Application.h>
 
 using namespace Urho3D;
 

Source/Urho3D/Audio/Audio.cpp

@@ -32,7 +32,7 @@
 #include "SoundListener.h"
 #include "SoundSource3D.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include "DebugNew.h"
 

Source/Urho3D/CMakeLists.txt

@@ -98,8 +98,8 @@ set_source_files_properties (${ALL_OBJ_FILES} PROPERTIES GENERATED TRUE)
 foreach (LIST_NAME LIBS INCLUDE_DIRS_ONLY LINK_LIBS_ONLY)
     set_list (${LIST_NAME} ENGINE_${LIST_NAME} REMOVE_DUPLICATE)
 endforeach ()
-# Add include directories to find the export header and SDL header
-list (APPEND INCLUDE_DIRS_ONLY ${CMAKE_CURRENT_BINARY_DIR} ../ThirdParty/SDL/include)
+# Add include directories to find the export header and headers from exported SDKs
+list (APPEND INCLUDE_DIRS_ONLY ${CMAKE_BINARY_DIR}/${DEST_INCLUDE_DIR})
 
 # Setup library output path
 if (ANDROID)
@@ -253,7 +253,7 @@ if (NOT IOS)
         string (REPLACE ";" "\" ${DASH}I\"" GLOBAL_INCLUDE_DIRS "${DASH}I\"${GLOBAL_INCLUDE_DIRS}\"")
         string (REPLACE "${SYSROOT}" "" GLOBAL_INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS})
     endif ()
-    set (ENGINE_INCLUDE_DIRS "${DASH}I\"\${includedir}${PATH_SUFFIX}\" ${DASH}I\"\${includedir}\"")
+    set (ENGINE_INCLUDE_DIRS "${DASH}I\"\${includedir}/${PATH_SUFFIX}\" ${DASH}I\"\${includedir}\"")
     configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Urho3D.pc.in ${CMAKE_CURRENT_BINARY_DIR}/Urho3D.pc @ONLY)
     if (ANDROID)
         set (RENAME RENAME Urho3D-${ANDROID_NDK_ABI_NAME}.pc)

Source/Urho3D/Graphics/OpenGL/OGLGraphicsImpl.h

@@ -55,7 +55,7 @@
 #define COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8c03
 #endif
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 namespace Urho3D
 {

Source/Urho3D/IO/File.h

@@ -28,7 +28,7 @@
 #include "Object.h"
 
 #ifdef ANDROID
-#include <SDL_rwops.h>
+#include <SDL/SDL_rwops.h>
 #endif
 
 namespace Urho3D

Source/Urho3D/IO/FileSystem.cpp

@@ -31,7 +31,7 @@
 #include "Log.h"
 #include "Thread.h"
 
-#include <SDL_filesystem.h>
+#include <SDL/SDL_filesystem.h>
 
 #include <cstdio>
 #include <cstring>

Source/Urho3D/IO/RWOpsWrapper.h

@@ -24,7 +24,7 @@
 
 #include "File.h"
 
-#include <SDL_rwops.h>
+#include <SDL/SDL_rwops.h>
 
 namespace Urho3D
 {

Source/Urho3D/Input/Input.cpp

@@ -40,7 +40,7 @@
 
 #include <cstring>
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include "DebugNew.h"
 

Source/Urho3D/Input/InputEvents.h

@@ -24,10 +24,10 @@
 
 #include "Object.h"
 
-#include <SDL_joystick.h>
-#include <SDL_gamecontroller.h>
-#include <SDL_keycode.h>
-#include <SDL_mouse.h>
+#include <SDL/SDL_joystick.h>
+#include <SDL/SDL_gamecontroller.h>
+#include <SDL/SDL_keycode.h>
+#include <SDL/SDL_mouse.h>
 
 namespace Urho3D
 {

Source/Urho3D/LuaScript/CMakeLists.txt

@@ -89,7 +89,7 @@ define_source_files (EXTRA_CPP_FILES ${GEN_CPP_FILES})
 set (LIBS ../../ThirdParty/Lua${JIT}/src)
 set (LINK_LIBS_ONLY toluapp)
 set (INCLUDE_DIRS_ONLY . .. ../Audio ../Container ../Core ../Engine ../Graphics ../Input ../IO ../Math ../Navigation ../Resource ../Scene ../UI
-    ../../ThirdParty/SDL/include ../../ThirdParty/toluapp/include ${CMAKE_BINARY_DIR}/Source/Urho3D)
+    ../../ThirdParty/toluapp/include ${CMAKE_BINARY_DIR}/${DEST_INCLUDE_DIR})
 
 if (URHO3D_NAVIGATION)
     set (INCLUDE_DIRS_ONLY ${INCLUDE_DIRS_ONLY} ../Navigation)

Source/Urho3D/Network/Connection.h

@@ -29,8 +29,8 @@
 #include "Timer.h"
 #include "VectorBuffer.h"
 
-#include <kNetFwd.h>
-#include <kNet/SharedPtr.h>
+#include <kNet/kNetFwd.h>
+#include <kNet/kNet/SharedPtr.h>
 
 #ifdef SendMessage
 #undef SendMessage

Source/Urho3D/Network/Network.h

@@ -27,8 +27,8 @@
 #include "Object.h"
 #include "VectorBuffer.h"
 
-#include <kNet/IMessageHandler.h>
-#include <kNet/INetworkServerListener.h>
+#include <kNet/kNet/IMessageHandler.h>
+#include <kNet/kNet/INetworkServerListener.h>
 
 namespace Urho3D
 {

Source/Urho3D/Physics/PhysicsWorld.h

@@ -29,7 +29,7 @@
 #include "Vector3.h"
 #include "VectorBuffer.h"
 
-#include <LinearMath/btIDebugDraw.h>
+#include <Bullet/LinearMath/btIDebugDraw.h>
 
 class btCollisionConfiguration;
 class btCollisionShape;

Source/Urho3D/Physics/RigidBody.h

@@ -25,7 +25,7 @@
 #include "Component.h"
 #include "VectorBuffer.h"
 
-#include <LinearMath/btMotionState.h>
+#include <Bullet/LinearMath/btMotionState.h>
 
 class btCompoundShape;
 class btRigidBody;

Source/Urho3D/Resource/Image.cpp

@@ -33,7 +33,7 @@
 #include <stb_image.h>
 #include <stb_image_write.h>
 #include <jo_jpeg.h>
-#include <SDL_surface.h>
+#include <SDL/SDL_surface.h>
 
 #include "DebugNew.h"
 

Source/Urho3D/UI/Cursor.h

@@ -26,7 +26,7 @@
 #include "Image.h"
 #include "Texture.h"
 
-#include <SDL_mouse.h>
+#include <SDL/SDL_mouse.h>
 
 namespace Urho3D
 {

Source/Urho3D/UI/UI.cpp

@@ -55,7 +55,7 @@
 #include "Window.h"
 #include "View3D.h"
 
-#include <SDL.h>
+#include <SDL/SDL.h>
 
 #include "DebugNew.h"