More CMake bullshit

src/Engine/CMakeLists.txt

@@ -1,20 +1,20 @@
-project(TacticalZ)
+project(TacticalZ-Engine)
 
 find_package(OpenGL REQUIRED)
-find_package(GLEW REQUIRED)
+#find_package(GLEW REQUIRED)
 find_package(GLFW REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system filesystem thread chrono)
 find_package(assimp REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)
 # Because FindOpenAL is retarded
-set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${CMAKE_SOURCE_DIR}/deps/include/AL")
-find_package(OpenAL REQUIRED)
+#set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${CMAKE_SOURCE_DIR}/deps/include/AL")
+#find_package(OpenAL REQUIRED)
 if(UNIX)
     find_package(X11 REQUIRED)
 endif()
 
-set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include)
+set(INCLUDE_PATH ${CMAKE_SOURCE_DIR}/include/Engine)
 include_directories(
     ${INCLUDE_PATH}
     ${OPENGL_INCLUDE_DIR}
@@ -23,8 +23,8 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
     ${assimp_INCLUDE_DIRS}
     ${PNG_INCLUDE_DIRS}
-    ${X11_INCLUDE_DIRS}
     ${OPENAL_INCLUDE_DIR}
+    ${X11_INCLUDE_DIRS}
 )
 
 file(GLOB SOURCE_FILES_Core
@@ -49,63 +49,12 @@ file(GLOB SOURCE_FILES_Rendering
     "Rendering/*.cpp"
 )
 source_group(Rendering FILES ${SOURCE_FILES_Rendering})
-file(GLOB SOURCE_FILES_Rendering_OpenGL
-    "${INCLUDE_PATH}/Rendering/OpenGL/Rendering/*.h"
-    "Rendering/OpenGL/*.cpp"
-)
-source_group(Rendering\\OpenGL FILES ${SOURCE_FILES_Rendering_OpenGL})
-file(GLOB SOURCE_FILES_Rendering_DirectX
-    "${INCLUDE_PATH}/Rendering/DirectX/Rendering/*.h"
-    "Rendering/DirectX/*.cpp"
-)
-source_group(Rendering\\DirectX FILES ${SOURCE_FILES_Rendering_DirectX})
-
-file(GLOB SOURCE_FILES_Transform
-    "${INCLUDE_PATH}/Transform/*.h"
-    "Transform/*.cpp"
-)
-source_group(Transform FILES ${SOURCE_FILES_Transform})
-
-file(GLOB SOURCE_FILES_Physics
-    "${INCLUDE_PATH}/Physics/*.h"
-    "Physics/*.cpp"
-)
-source_group(Physics FILES ${SOURCE_FILES_Physics})
-
-file(GLOB SOURCE_FILES_Game
-    "${INCLUDE_PATH}/Game/*.h"
-    "Game/*.cpp"
-)
-source_group(Game FILES ${SOURCE_FILES_Game})
-file(GLOB SOURCE_FILES_Game_GUI
-    "${INCLUDE_PATH}/Game/GUI/*.h"
-    "Game/GUI/*.cpp"
-)
-source_group(Game\\GUI FILES ${SOURCE_FILES_Game_GUI})
-
-file(GLOB SOURCE_FILES_Sound
-    "${INCLUDE_PATH}/Sound/*.h"
-    "Sound/*.cpp"
-)
-source_group(Sound FILES ${SOURCE_FILES_Sound})
-
-file(GLOB SOURCE_FILES_GUI
-    "${INCLUDE_PATH}/GUI/*.h"
-    "GUI/*.cpp"
-)
-source_group(GUI FILES ${SOURCE_FILES_GUI})
 
 set(SOURCE_FILES
     ${SOURCE_FILES_Core}
     ${SOURCE_FILES_Core_Util}
-    ${SOURCE_FILES_Input}
+    #${SOURCE_FILES_Input}
     ${SOURCE_FILES_Rendering}
-    ${SOURCE_FILES_Transform}
-    ${SOURCE_FILES_Physics}
-    ${SOURCE_FILES_Game}
-    ${SOURCE_FILES_Game_GUI}
-    ${SOURCE_FILES_Sound}
-    ${SOURCE_FILES_GUI}
 )
 
 set(LIBRARIES
@@ -115,8 +64,8 @@ set(LIBRARIES
     ${Boost_LIBRARIES}
     ${assimp_LIBRARIES}
     ${PNG_LIBRARIES}
-    ${X11_LIBRARIES}
     ${OPENAL_LIBRARY}
+    ${X11_LIBRARIES}
 )
 
 if(CMAKE_COMPILER_IS_GNUCXX)
@@ -129,12 +78,3 @@ add_library(Engine ${SOURCE_FILES})
 target_link_libraries(Engine
     ${LIBRARIES}
 )
-
-add_executable(Game 
-	main.cpp
-)
-target_link_libraries(Game
-	Engine
-    ${LIBRARIES}
-)
-

src/Engine/Core/ResourceManager.cpp

@@ -20,7 +20,6 @@ unsigned int ResourceManager::GetTypeID(std::string resourceType)
 	return m_ResourceTypeIDs[resourceType];
 }
 
-
 void ResourceManager::Reload(std::string resourceName)
 {
 	auto it = m_ResourceFromName.find(resourceName);