Tweak CMakeLists so sources appear in IDEs [skip ci]

include/system/FontImGui.h

@@ -8,6 +8,8 @@
 #ifndef _FONT_IMGUI_H_
 #define _FONT_IMGUI_H_
 
+#include <string>
+
 /*!
  * \brief Default Font implementation
  */

src/CMakeLists.txt

@@ -64,28 +64,28 @@ endif (GLM_FOUND)
 #################################################################
 
 # Set Source files
-set (SRCS ${SRCS} "Camera.cpp")
-set (SRCS ${SRCS} "Console.cpp")
-set (SRCS ${SRCS} "Entity.cpp")
-set (SRCS ${SRCS} "Exception.cpp")
-set (SRCS ${SRCS} "Game.cpp")
-set (SRCS ${SRCS} "Log.cpp")
+set (SRCS ${SRCS} "Camera.cpp" "../include/Camera.h")
+set (SRCS ${SRCS} "Console.cpp" "../include/Console.h")
+set (SRCS ${SRCS} "Entity.cpp" "../include/Entity.h")
+set (SRCS ${SRCS} "Exception.cpp" "../include/Exception.h")
+set (SRCS ${SRCS} "Game.cpp" "../include/Game.h")
+set (SRCS ${SRCS} "Log.cpp" "../include/Log.h")
 set (SRCS ${SRCS} "main.cpp")
-set (SRCS ${SRCS} "Menu.cpp")
-set (SRCS ${SRCS} "MenuFolder.cpp")
-set (SRCS ${SRCS} "Mesh.cpp")
-set (SRCS ${SRCS} "Render.cpp")
-set (SRCS ${SRCS} "Room.cpp")
-set (SRCS ${SRCS} "RoomData.cpp")
-set (SRCS ${SRCS} "RunTime.cpp")
-set (SRCS ${SRCS} "Script.cpp")
-set (SRCS ${SRCS} "SkeletalModel.cpp")
-set (SRCS ${SRCS} "SoundManager.cpp")
-set (SRCS ${SRCS} "Sprite.cpp")
-set (SRCS ${SRCS} "StaticMesh.cpp")
-set (SRCS ${SRCS} "TextureManager.cpp")
-set (SRCS ${SRCS} "UI.cpp")
-set (SRCS ${SRCS} "World.cpp")
+set (SRCS ${SRCS} "Menu.cpp" "../include/Menu.h")
+set (SRCS ${SRCS} "MenuFolder.cpp" "../include/MenuFolder.h")
+set (SRCS ${SRCS} "Mesh.cpp" "../include/Mesh.h")
+set (SRCS ${SRCS} "Render.cpp" "../include/Render.h")
+set (SRCS ${SRCS} "Room.cpp" "../include/Room.h")
+set (SRCS ${SRCS} "RoomData.cpp" "../include/RoomData.h")
+set (SRCS ${SRCS} "RunTime.cpp" "../include/RunTime.h")
+set (SRCS ${SRCS} "Script.cpp" "../include/Script.h")
+set (SRCS ${SRCS} "SkeletalModel.cpp" "../include/SkeletalModel.h")
+set (SRCS ${SRCS} "SoundManager.cpp" "../include/SoundManager.h")
+set (SRCS ${SRCS} "Sprite.cpp" "../include/Sprite.h")
+set (SRCS ${SRCS} "StaticMesh.cpp" "../include/StaticMesh.h")
+set (SRCS ${SRCS} "TextureManager.cpp" "../include/TextureManager.h")
+set (SRCS ${SRCS} "UI.cpp" "../include/UI.h")
+set (SRCS ${SRCS} "World.cpp" "../include/World.h")
 
 # Select available Sound library
 if (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
@@ -227,9 +227,8 @@ add_subdirectory ("system")
 add_subdirectory ("utils")
 
 # Add Executable
-add_library (OpenRaider_all OBJECT ${SRCS})
 add_executable (OpenRaider MACOSX_BUNDLE ${RESRCS}
-    $<TARGET_OBJECTS:OpenRaider_all> $<TARGET_OBJECTS:OpenRaider_commands>
+    ${SRCS} $<TARGET_OBJECTS:OpenRaider_commands>
     $<TARGET_OBJECTS:OpenRaider_deps> $<TARGET_OBJECTS:OpenRaider_loader>
     $<TARGET_OBJECTS:OpenRaider_utils> $<TARGET_OBJECTS:OpenRaider_system>
 )

src/commands/CMakeLists.txt

@@ -1,11 +1,11 @@
 # Source files
-set (CMD_SRCS ${CMD_SRCS} "Command.cpp")
-set (CMD_SRCS ${CMD_SRCS} "CommandBind.cpp")
-set (CMD_SRCS ${CMD_SRCS} "CommandEngine.cpp")
-set (CMD_SRCS ${CMD_SRCS} "CommandGame.cpp")
-set (CMD_SRCS ${CMD_SRCS} "CommandMove.cpp")
-set (CMD_SRCS ${CMD_SRCS} "CommandRender.cpp")
-set (CMD_SRCS ${CMD_SRCS} "CommandSet.cpp")
+set (CMD_SRCS ${CMD_SRCS} "Command.cpp" "../../include/commands/Command.h")
+set (CMD_SRCS ${CMD_SRCS} "CommandBind.cpp" "../../include/commands/CommandBind.h")
+set (CMD_SRCS ${CMD_SRCS} "CommandEngine.cpp" "../../include/commands/CommandEngine.h")
+set (CMD_SRCS ${CMD_SRCS} "CommandGame.cpp" "../../include/commands/CommandGame.h")
+set (CMD_SRCS ${CMD_SRCS} "CommandMove.cpp" "../../include/commands/CommandMove.h")
+set (CMD_SRCS ${CMD_SRCS} "CommandRender.cpp" "../../include/commands/CommandRender.h")
+set (CMD_SRCS ${CMD_SRCS} "CommandSet.cpp" "../../include/commands/CommandSet.h")
 
 # Add library
 add_library (OpenRaider_commands OBJECT ${CMD_SRCS})

src/deps/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Source files
-set (DEPS_SRCS ${DEPS_SRCS} "commander/commander.c")
-set (DEPS_SRCS ${DEPS_SRCS} "imgui/imgui.cpp")
+set (DEPS_SRCS ${DEPS_SRCS} "commander/commander.c" "commander/commander.h")
+set (DEPS_SRCS ${DEPS_SRCS} "imgui/imgui.cpp" "imgui/imgui.h" "imgui/imconfig.h")
 
 # Add library
 add_library (OpenRaider_deps OBJECT ${DEPS_SRCS})

src/loader/CMakeLists.txt

@@ -1,8 +1,8 @@
 # Source files
-set (LOADER_SRCS ${LOADER_SRCS} "Loader.cpp")
-set (LOADER_SRCS ${LOADER_SRCS} "LoaderTR1.cpp")
-set (LOADER_SRCS ${LOADER_SRCS} "LoaderTR2.cpp")
-set (LOADER_SRCS ${LOADER_SRCS} "LoaderTR3.cpp")
+set (LOADER_SRCS ${LOADER_SRCS} "Loader.cpp" "../../include/loader/Loader.h")
+set (LOADER_SRCS ${LOADER_SRCS} "LoaderTR1.cpp" "../../include/loader/LoaderTR1.h")
+set (LOADER_SRCS ${LOADER_SRCS} "LoaderTR2.cpp" "../../include/loader/LoaderTR2.h")
+set (LOADER_SRCS ${LOADER_SRCS} "LoaderTR3.cpp" "../../include/loader/LoaderTR3.h")
 
 # Add library
 add_library (OpenRaider_loader OBJECT ${LOADER_SRCS})

src/system/CMakeLists.txt

@@ -1,26 +1,26 @@
 # Source files
-set (SYS_SRCS ${SYS_SRCS} "Font.cpp")
-set (SYS_SRCS ${SYS_SRCS} "FontImGui.cpp")
-set (SYS_SRCS ${SYS_SRCS} "FontTRLE.cpp")
-set (SYS_SRCS ${SYS_SRCS} "Sound.cpp")
-set (SYS_SRCS ${SYS_SRCS} "Window.cpp")
+set (SYS_SRCS ${SYS_SRCS} "Font.cpp" "../../include/system/Font.h")
+set (SYS_SRCS ${SYS_SRCS} "FontImGui.cpp" "../../include/system/FontImGui.h")
+set (SYS_SRCS ${SYS_SRCS} "FontTRLE.cpp" "../../include/system/FontTRLE.h")
+set (SYS_SRCS ${SYS_SRCS} "Sound.cpp" "../../include/system/Sound.h")
+set (SYS_SRCS ${SYS_SRCS} "Window.cpp" "../../include/system/Window.h")
 
 # Select available Sound library
 if (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
-    set (SYS_SRCS ${SYS_SRCS} "SoundAL.cpp")
+    set (SYS_SRCS ${SYS_SRCS} "SoundAL.cpp" "../../include/system/SoundAL.h")
 else (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
     message (STATUS "Disabled Sound support (no OpenAL and ALUT)!")
 endif (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
 
 # Select available Windowing library
 if (SDL2_FOUND AND NOT FORCE_GLUT)
-    set (SYS_SRCS ${SYS_SRCS} "WindowSDL.cpp")
+    set (SYS_SRCS ${SYS_SRCS} "WindowSDL.cpp" "../../include/system/WindowSDL.h")
     if (SDL2TTF_FOUND)
-        set (SYS_SRCS ${SYS_SRCS} "FontSDL.cpp")
+        set (SYS_SRCS ${SYS_SRCS} "FontSDL.cpp" "../../include/system/FontSDL.h")
     endif (SDL2TTF_FOUND)
 else (SDL2_FOUND AND NOT FORCE_GLUT)
     if (FREEGLUT_FOUND)
-        set (SYS_SRCS ${SYS_SRCS} "WindowGLUT.cpp")
+        set (SYS_SRCS ${SYS_SRCS} "WindowGLUT.cpp" "../../include/system/WindowGLUT.h")
     else (FREEGLUT_FOUND)
         message (FATAL_ERROR "SDL2 or freeGLUT are required!")
     endif (FREEGLUT_FOUND)

src/utils/CMakeLists.txt

@@ -1,17 +1,17 @@
 # Source files
-set (UTIL_SRCS ${UTIL_SRCS} "binary.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "File.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "filesystem.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "Folder.cpp")
+set (UTIL_SRCS ${UTIL_SRCS} "binary.cpp" "../../include/utils/binary.h")
+set (UTIL_SRCS ${UTIL_SRCS} "File.cpp" "../../include/utils/File.h")
+set (UTIL_SRCS ${UTIL_SRCS} "filesystem.cpp" "../../include/utils/filesystem.h")
+set (UTIL_SRCS ${UTIL_SRCS} "Folder.cpp" "../../include/utils/Folder.h")
 set (UTIL_SRCS ${UTIL_SRCS} "FolderRecursive.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "pcx.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "pixel.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "tga.cpp")
-set (UTIL_SRCS ${UTIL_SRCS} "time.cpp")
+set (UTIL_SRCS ${UTIL_SRCS} "pcx.cpp" "../../include/utils/pcx.h")
+set (UTIL_SRCS ${UTIL_SRCS} "pixel.cpp" "../../include/utils/pixel.h")
+set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp" "../../include/utils/strings.h")
+set (UTIL_SRCS ${UTIL_SRCS} "tga.cpp" "../../include/utils/tga.h")
+set (UTIL_SRCS ${UTIL_SRCS} "time.cpp" "../../include/utils/time.h")
 
 if (USING_PNG)
-    set (UTIL_SRCS ${UTIL_SRCS} "png.cpp")
+    set (UTIL_SRCS ${UTIL_SRCS} "png.cpp" "../../include/utils/png.h")
 endif (USING_PNG)
 
 # Add library

test/CMakeLists.txt

@@ -26,7 +26,8 @@ add_executable (tester_loader EXCLUDE_FROM_ALL
 #################################################################
 
 add_executable (tester_script EXCLUDE_FROM_ALL
-    "Script.cpp" "../src/Script.cpp" "../src/main.cpp"
+    "Script.cpp" "ScriptPayload.h" "ScriptTest.h"
+    "../src/Script.cpp" "../src/main.cpp"
     "../src/utils/binary.cpp" "../src/Exception.cpp"
 )