Avoid the include dirs hack for finding the Urho3D.h header.

It is now a library user own's responsibility to include the Urho3D.h in their source code. Or to include it as part of their own precompiled header similar to what Urho3D project has done.

Source/Extras/OgreBatchConverter/OgreBatchConverter.cpp

@@ -1,6 +1,8 @@
 // OgreBatchConverter.cpp : Defines the entry point for the console application.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Core/Context.h>
 #include <Urho3D/IO/FileSystem.h>
 #include <Urho3D/Core/ProcessUtils.h>

Source/Samples/01_HelloWorld/HelloWorld.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>
 #include <Urho3D/UI/Font.h>

Source/Samples/02_HelloGUI/HelloGUI.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/UI/Button.h>
 #include <Urho3D/UI/BorderImage.h>
 #include <Urho3D/UI/CheckBox.h>

Source/Samples/03_Sprites/Sprites.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>
 #include <Urho3D/Graphics/Graphics.h>

Source/Samples/04_StaticScene/StaticScene.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/05_AnimatingScene/AnimatingScene.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/05_AnimatingScene/Rotator.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Scene/Scene.h>
 #include <Urho3D/Scene/SceneEvents.h>
 

Source/Samples/06_SkeletalAnimation/Mover.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/AnimatedModel.h>
 #include <Urho3D/Graphics/AnimationState.h>
 #include <Urho3D/Scene/Scene.h>

Source/Samples/06_SkeletalAnimation/SkeletalAnimation.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Animation.h>
 #include <Urho3D/Graphics/AnimatedModel.h>
 #include <Urho3D/Graphics/AnimationState.h>

Source/Samples/07_Billboards/Billboards.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/BillboardSet.h>
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>

Source/Samples/08_Decals/Decals.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/UI/Cursor.h>

Source/Samples/09_MultipleViewports/MultipleViewports.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/UI/Cursor.h>

Source/Samples/10_RenderToTexture/RenderToTexture.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/10_RenderToTexture/Rotator.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Scene/Scene.h>
 #include <Urho3D/Scene/SceneEvents.h>
 

Source/Samples/11_Physics/Physics.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Physics/CollisionShape.h>
 #include <Urho3D/Core/CoreEvents.h>

Source/Samples/12_PhysicsStressTest/PhysicsStressTest.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Physics/CollisionShape.h>
 #include <Urho3D/Core/CoreEvents.h>

Source/Samples/13_Ragdolls/CreateRagdoll.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/AnimatedModel.h>
 #include <Urho3D/IO/Log.h>
 #include <Urho3D/Scene/Node.h>

Source/Samples/13_Ragdolls/Ragdolls.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/AnimatedModel.h>
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Physics/CollisionShape.h>

Source/Samples/14_SoundEffects/SoundEffects.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Audio/Audio.h>
 #include <Urho3D/UI/Button.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/15_Navigation/Navigation.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/AnimatedModel.h>
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>

Source/Samples/16_Chat/Chat.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Audio/Audio.h>
 #include <Urho3D/UI/Button.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/17_SceneReplication/SceneReplication.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/UI/Button.h>
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Physics/CollisionShape.h>

Source/Samples/18_CharacterDemo/Character.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/AnimationController.h>
 #include <Urho3D/Core/Context.h>
 #include <Urho3D/IO/MemoryBuffer.h>

Source/Samples/18_CharacterDemo/CharacterDemo.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/AnimatedModel.h>
 #include <Urho3D/Graphics/AnimationController.h>
 #include <Urho3D/Graphics/Camera.h>

Source/Samples/18_CharacterDemo/Touch.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Network/Controls.h>
 #include <Urho3D/Graphics/Graphics.h>
 #include <Urho3D/Input/Input.h>

Source/Samples/19_VehicleDemo/Vehicle.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Physics/CollisionShape.h>
 #include <Urho3D/Physics/Constraint.h>
 #include <Urho3D/Core/Context.h>

Source/Samples/19_VehicleDemo/VehicleDemo.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Physics/CollisionShape.h>
 #include <Urho3D/Physics/Constraint.h>

Source/Samples/20_HugeObjectCount/HugeObjectCount.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/21_AngelScriptIntegration/AngelScriptIntegration.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/22_LuaIntegration/LuaIntegration.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/23_Water/Water.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/24_Urho2DSprite/Urho2DSprite.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Urho2D/AnimatedSprite2D.h>
 #include <Urho3D/Urho2D/AnimationSet2D.h>
 #include <Urho3D/Graphics/Camera.h>

Source/Samples/25_Urho2DParticle/Urho2DParticle.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/26_ConsoleInput/ConsoleInput.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/UI/Button.h>
 #include <Urho3D/Engine/Console.h>
 #include <Urho3D/Core/CoreEvents.h>

Source/Samples/27_Urho2DPhysics/Urho2DPhysics.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Urho2D/CollisionBox2D.h>
 #include <Urho3D/Urho2D/CollisionCircle2D.h>

Source/Samples/28_Urho2DPhysicsRope/Urho2DPhysicsRope.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Urho2D/CollisionBox2D.h>
 #include <Urho3D/Urho2D/CollisionEdge2D.h>

Source/Samples/29_SoundSynthesis/SoundSynthesis.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Audio/BufferedSoundStream.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/30_LightAnimation/LightAnimation.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Scene/Animatable.h>
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>

Source/Samples/31_MaterialAnimation/MaterialAnimation.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/32_Urho2DConstraints/Urho2DConstraints.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Urho2D/CollisionBox2D.h>
 #include <Urho3D/Urho2D/CollisionCircle2D.h>

Source/Samples/33_Urho2DSpriterAnimation/Urho2DSpriterAnimation.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Urho2D/AnimatedSprite2D.h>
 #include <Urho3D/Urho2D/AnimationSet2D.h>
 #include <Urho3D/Graphics/Camera.h>

Source/Samples/34_DynamicGeometry/DynamicGeometry.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/35_SignedDistanceFieldText/SignedDistanceFieldText.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/36_Urho2DTileMap/Urho2DTileMap.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/Engine/Engine.h>

Source/Samples/37_UIDrag/UIDrag.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/UI/Button.h>
 #include <Urho3D/Core/CoreEvents.h>
 #include <Urho3D/UI/Font.h>

Source/Samples/38_SceneAndUILoad/SceneAndUILoad.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/UI/Button.h>
 #include <Urho3D/Graphics/Camera.h>
 #include <Urho3D/Core/CoreEvents.h>

Source/Tools/AssetImporter/AssetImporter.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Graphics/AnimatedModel.h>
 #include <Urho3D/Graphics/Animation.h>
 #include <Urho3D/Core/Context.h>

Source/Tools/OgreImporter/OgreImporter.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Core/Context.h>
 #include <Urho3D/IO/File.h>
 #include <Urho3D/IO/FileSystem.h>

Source/Tools/PackageTool/PackageTool.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Core/Context.h>
 #include <Urho3D/Container/ArrayPtr.h>
 #include <Urho3D/IO/File.h>

Source/Tools/RampGenerator/RampGenerator.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Container/ArrayPtr.h>
 #include <Urho3D/Math/MathDefs.h>
 #include <Urho3D/Core/ProcessUtils.h>

Source/Tools/ScriptCompiler/ScriptCompiler.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Core/Context.h>
 #include <Urho3D/Engine/Engine.h>
 #include <Urho3D/IO/File.h>

Source/Tools/Urho3DPlayer/Urho3DPlayer.cpp

@@ -20,6 +20,8 @@
 // THE SOFTWARE.
 //
 
+#include <Urho3D/Urho3D.h>
+
 #include <Urho3D/Engine/Engine.h>
 #include <Urho3D/IO/FileSystem.h>
 #include <Urho3D/IO/Log.h>

Source/Urho3D/CMakeLists.txt

@@ -53,6 +53,7 @@ if (URHO3D_LUA)
     endif ()
 
     # Use the host tool to generate source files for tolua++ API binding
+    file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated)
     file (GLOB API_PKG_FILES LuaScript/pkgs/*.pkg)
     foreach (DIR Navigation Network Physics Urho2D)
         string (TOUPPER URHO3D_${DIR} OPT)
@@ -131,10 +132,7 @@ set_source_files_properties (${ALL_OBJ_FILES} PROPERTIES GENERATED TRUE)
 
 # Define dependency libs
 # Add include directories to find the precompiled header, export header, and installed headers from thirdparty libs
-# Hack: the ${CMAKE_CURRENT_SOURCE_DIR}/generated is added so that "../Urho3D.h" include path could be resolved back to CMAKE_CURRENT_BINARY_DIR where this generated header is located
-#       the "../Urho3D.h" relative path is preferred over "Urho3D.h" because we want to avoid adding "include/Urho3D" into the search path when *using* the library
-file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated)
-set (INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/generated ${CMAKE_BINARY_DIR}/${DEST_INCLUDE_DIR}/ThirdParty)
+set (INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/${DEST_INCLUDE_DIR}/ThirdParty)
 if (URHO3D_PHYSICS)
     # Bullet library depends on its own include dir to be added in the header search path
     # This is more practical than patching its header files in many places to make them work with relative path

Source/Urho3D/Container/Allocator.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
-
 #include <new>
 
 namespace Urho3D

Source/Urho3D/Container/HashBase.h

@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
 #include "../Container/Allocator.h"
 #include "../Container/Hash.h"
 #include "../Container/Swap.h"

Source/Urho3D/Container/LinkedList.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
-
 namespace Urho3D
 {
 

Source/Urho3D/Container/ListBase.h

@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
 #include "../Container/Allocator.h"
 #include "../Container/Swap.h"
 

Source/Urho3D/Container/RefCounted.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
-
 namespace Urho3D
 {
 

Source/Urho3D/Container/Str.h

@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
 #include "../Container/Vector.h"
 
 #include <cstring>

Source/Urho3D/Container/VectorBase.h

@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
 #include "../Container/Swap.h"
 
 namespace Urho3D

Source/Urho3D/Core/Condition.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
-
 namespace Urho3D
 {
 

Source/Urho3D/Core/Mutex.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
-
 namespace Urho3D
 {
 

Source/Urho3D/Core/Thread.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
-
 #ifndef WIN32
 #include <pthread.h>
 typedef pthread_t ThreadID;

Source/Urho3D/Graphics/Tangent.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
-
 namespace Urho3D
 {
 

Source/Urho3D/IO/Compression.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
-
 namespace Urho3D
 {
 

Source/Urho3D/Math/Random.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
-
 namespace Urho3D
 {
 

Source/Urho3D/Precompiled.h

@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include "Urho3D.h"
+
 #include "Container/HashMap.h"
 #include "Container/HashSet.h"
 #include "Container/Sort.h"

Source/Urho3D/Revision.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "Urho3D.h"
-
 namespace Urho3D
 {
 

Source/Urho3D/Script/Addons.h

@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "../Urho3D.h"
 #include "../Container/HashMap.h"
 #include "../Container/Str.h"