Procházet zdrojové kódy

Tweak CMakeLists so sources appear in IDEs [skip ci]

Thomas Buck před 10 roky
rodič
revize
881d13ab74

+ 2
- 0
include/system/FontImGui.h Zobrazit soubor

@@ -8,6 +8,8 @@
8 8
 #ifndef _FONT_IMGUI_H_
9 9
 #define _FONT_IMGUI_H_
10 10
 
11
+#include <string>
12
+
11 13
 /*!
12 14
  * \brief Default Font implementation
13 15
  */

+ 22
- 23
src/CMakeLists.txt Zobrazit soubor

@@ -64,28 +64,28 @@ endif (GLM_FOUND)
64 64
 #################################################################
65 65
 
66 66
 # Set Source files
67
-set (SRCS ${SRCS} "Camera.cpp")
68
-set (SRCS ${SRCS} "Console.cpp")
69
-set (SRCS ${SRCS} "Entity.cpp")
70
-set (SRCS ${SRCS} "Exception.cpp")
71
-set (SRCS ${SRCS} "Game.cpp")
72
-set (SRCS ${SRCS} "Log.cpp")
67
+set (SRCS ${SRCS} "Camera.cpp" "../include/Camera.h")
68
+set (SRCS ${SRCS} "Console.cpp" "../include/Console.h")
69
+set (SRCS ${SRCS} "Entity.cpp" "../include/Entity.h")
70
+set (SRCS ${SRCS} "Exception.cpp" "../include/Exception.h")
71
+set (SRCS ${SRCS} "Game.cpp" "../include/Game.h")
72
+set (SRCS ${SRCS} "Log.cpp" "../include/Log.h")
73 73
 set (SRCS ${SRCS} "main.cpp")
74
-set (SRCS ${SRCS} "Menu.cpp")
75
-set (SRCS ${SRCS} "MenuFolder.cpp")
76
-set (SRCS ${SRCS} "Mesh.cpp")
77
-set (SRCS ${SRCS} "Render.cpp")
78
-set (SRCS ${SRCS} "Room.cpp")
79
-set (SRCS ${SRCS} "RoomData.cpp")
80
-set (SRCS ${SRCS} "RunTime.cpp")
81
-set (SRCS ${SRCS} "Script.cpp")
82
-set (SRCS ${SRCS} "SkeletalModel.cpp")
83
-set (SRCS ${SRCS} "SoundManager.cpp")
84
-set (SRCS ${SRCS} "Sprite.cpp")
85
-set (SRCS ${SRCS} "StaticMesh.cpp")
86
-set (SRCS ${SRCS} "TextureManager.cpp")
87
-set (SRCS ${SRCS} "UI.cpp")
88
-set (SRCS ${SRCS} "World.cpp")
74
+set (SRCS ${SRCS} "Menu.cpp" "../include/Menu.h")
75
+set (SRCS ${SRCS} "MenuFolder.cpp" "../include/MenuFolder.h")
76
+set (SRCS ${SRCS} "Mesh.cpp" "../include/Mesh.h")
77
+set (SRCS ${SRCS} "Render.cpp" "../include/Render.h")
78
+set (SRCS ${SRCS} "Room.cpp" "../include/Room.h")
79
+set (SRCS ${SRCS} "RoomData.cpp" "../include/RoomData.h")
80
+set (SRCS ${SRCS} "RunTime.cpp" "../include/RunTime.h")
81
+set (SRCS ${SRCS} "Script.cpp" "../include/Script.h")
82
+set (SRCS ${SRCS} "SkeletalModel.cpp" "../include/SkeletalModel.h")
83
+set (SRCS ${SRCS} "SoundManager.cpp" "../include/SoundManager.h")
84
+set (SRCS ${SRCS} "Sprite.cpp" "../include/Sprite.h")
85
+set (SRCS ${SRCS} "StaticMesh.cpp" "../include/StaticMesh.h")
86
+set (SRCS ${SRCS} "TextureManager.cpp" "../include/TextureManager.h")
87
+set (SRCS ${SRCS} "UI.cpp" "../include/UI.h")
88
+set (SRCS ${SRCS} "World.cpp" "../include/World.h")
89 89
 
90 90
 # Select available Sound library
91 91
 if (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
@@ -227,9 +227,8 @@ add_subdirectory ("system")
227 227
 add_subdirectory ("utils")
228 228
 
229 229
 # Add Executable
230
-add_library (OpenRaider_all OBJECT ${SRCS})
231 230
 add_executable (OpenRaider MACOSX_BUNDLE ${RESRCS}
232
-    $<TARGET_OBJECTS:OpenRaider_all> $<TARGET_OBJECTS:OpenRaider_commands>
231
+    ${SRCS} $<TARGET_OBJECTS:OpenRaider_commands>
233 232
     $<TARGET_OBJECTS:OpenRaider_deps> $<TARGET_OBJECTS:OpenRaider_loader>
234 233
     $<TARGET_OBJECTS:OpenRaider_utils> $<TARGET_OBJECTS:OpenRaider_system>
235 234
 )

+ 7
- 7
src/commands/CMakeLists.txt Zobrazit soubor

@@ -1,11 +1,11 @@
1 1
 # Source files
2
-set (CMD_SRCS ${CMD_SRCS} "Command.cpp")
3
-set (CMD_SRCS ${CMD_SRCS} "CommandBind.cpp")
4
-set (CMD_SRCS ${CMD_SRCS} "CommandEngine.cpp")
5
-set (CMD_SRCS ${CMD_SRCS} "CommandGame.cpp")
6
-set (CMD_SRCS ${CMD_SRCS} "CommandMove.cpp")
7
-set (CMD_SRCS ${CMD_SRCS} "CommandRender.cpp")
8
-set (CMD_SRCS ${CMD_SRCS} "CommandSet.cpp")
2
+set (CMD_SRCS ${CMD_SRCS} "Command.cpp" "../../include/commands/Command.h")
3
+set (CMD_SRCS ${CMD_SRCS} "CommandBind.cpp" "../../include/commands/CommandBind.h")
4
+set (CMD_SRCS ${CMD_SRCS} "CommandEngine.cpp" "../../include/commands/CommandEngine.h")
5
+set (CMD_SRCS ${CMD_SRCS} "CommandGame.cpp" "../../include/commands/CommandGame.h")
6
+set (CMD_SRCS ${CMD_SRCS} "CommandMove.cpp" "../../include/commands/CommandMove.h")
7
+set (CMD_SRCS ${CMD_SRCS} "CommandRender.cpp" "../../include/commands/CommandRender.h")
8
+set (CMD_SRCS ${CMD_SRCS} "CommandSet.cpp" "../../include/commands/CommandSet.h")
9 9
 
10 10
 # Add library
11 11
 add_library (OpenRaider_commands OBJECT ${CMD_SRCS})

+ 2
- 2
src/deps/CMakeLists.txt Zobrazit soubor

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

+ 4
- 4
src/loader/CMakeLists.txt Zobrazit soubor

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

+ 9
- 9
src/system/CMakeLists.txt Zobrazit soubor

@@ -1,26 +1,26 @@
1 1
 # Source files
2
-set (SYS_SRCS ${SYS_SRCS} "Font.cpp")
3
-set (SYS_SRCS ${SYS_SRCS} "FontImGui.cpp")
4
-set (SYS_SRCS ${SYS_SRCS} "FontTRLE.cpp")
5
-set (SYS_SRCS ${SYS_SRCS} "Sound.cpp")
6
-set (SYS_SRCS ${SYS_SRCS} "Window.cpp")
2
+set (SYS_SRCS ${SYS_SRCS} "Font.cpp" "../../include/system/Font.h")
3
+set (SYS_SRCS ${SYS_SRCS} "FontImGui.cpp" "../../include/system/FontImGui.h")
4
+set (SYS_SRCS ${SYS_SRCS} "FontTRLE.cpp" "../../include/system/FontTRLE.h")
5
+set (SYS_SRCS ${SYS_SRCS} "Sound.cpp" "../../include/system/Sound.h")
6
+set (SYS_SRCS ${SYS_SRCS} "Window.cpp" "../../include/system/Window.h")
7 7
 
8 8
 # Select available Sound library
9 9
 if (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
10
-    set (SYS_SRCS ${SYS_SRCS} "SoundAL.cpp")
10
+    set (SYS_SRCS ${SYS_SRCS} "SoundAL.cpp" "../../include/system/SoundAL.h")
11 11
 else (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
12 12
     message (STATUS "Disabled Sound support (no OpenAL and ALUT)!")
13 13
 endif (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
14 14
 
15 15
 # Select available Windowing library
16 16
 if (SDL2_FOUND AND NOT FORCE_GLUT)
17
-    set (SYS_SRCS ${SYS_SRCS} "WindowSDL.cpp")
17
+    set (SYS_SRCS ${SYS_SRCS} "WindowSDL.cpp" "../../include/system/WindowSDL.h")
18 18
     if (SDL2TTF_FOUND)
19
-        set (SYS_SRCS ${SYS_SRCS} "FontSDL.cpp")
19
+        set (SYS_SRCS ${SYS_SRCS} "FontSDL.cpp" "../../include/system/FontSDL.h")
20 20
     endif (SDL2TTF_FOUND)
21 21
 else (SDL2_FOUND AND NOT FORCE_GLUT)
22 22
     if (FREEGLUT_FOUND)
23
-        set (SYS_SRCS ${SYS_SRCS} "WindowGLUT.cpp")
23
+        set (SYS_SRCS ${SYS_SRCS} "WindowGLUT.cpp" "../../include/system/WindowGLUT.h")
24 24
     else (FREEGLUT_FOUND)
25 25
         message (FATAL_ERROR "SDL2 or freeGLUT are required!")
26 26
     endif (FREEGLUT_FOUND)

+ 10
- 10
src/utils/CMakeLists.txt Zobrazit soubor

@@ -1,17 +1,17 @@
1 1
 # Source files
2
-set (UTIL_SRCS ${UTIL_SRCS} "binary.cpp")
3
-set (UTIL_SRCS ${UTIL_SRCS} "File.cpp")
4
-set (UTIL_SRCS ${UTIL_SRCS} "filesystem.cpp")
5
-set (UTIL_SRCS ${UTIL_SRCS} "Folder.cpp")
2
+set (UTIL_SRCS ${UTIL_SRCS} "binary.cpp" "../../include/utils/binary.h")
3
+set (UTIL_SRCS ${UTIL_SRCS} "File.cpp" "../../include/utils/File.h")
4
+set (UTIL_SRCS ${UTIL_SRCS} "filesystem.cpp" "../../include/utils/filesystem.h")
5
+set (UTIL_SRCS ${UTIL_SRCS} "Folder.cpp" "../../include/utils/Folder.h")
6 6
 set (UTIL_SRCS ${UTIL_SRCS} "FolderRecursive.cpp")
7
-set (UTIL_SRCS ${UTIL_SRCS} "pcx.cpp")
8
-set (UTIL_SRCS ${UTIL_SRCS} "pixel.cpp")
9
-set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp")
10
-set (UTIL_SRCS ${UTIL_SRCS} "tga.cpp")
11
-set (UTIL_SRCS ${UTIL_SRCS} "time.cpp")
7
+set (UTIL_SRCS ${UTIL_SRCS} "pcx.cpp" "../../include/utils/pcx.h")
8
+set (UTIL_SRCS ${UTIL_SRCS} "pixel.cpp" "../../include/utils/pixel.h")
9
+set (UTIL_SRCS ${UTIL_SRCS} "strings.cpp" "../../include/utils/strings.h")
10
+set (UTIL_SRCS ${UTIL_SRCS} "tga.cpp" "../../include/utils/tga.h")
11
+set (UTIL_SRCS ${UTIL_SRCS} "time.cpp" "../../include/utils/time.h")
12 12
 
13 13
 if (USING_PNG)
14
-    set (UTIL_SRCS ${UTIL_SRCS} "png.cpp")
14
+    set (UTIL_SRCS ${UTIL_SRCS} "png.cpp" "../../include/utils/png.h")
15 15
 endif (USING_PNG)
16 16
 
17 17
 # Add library

+ 2
- 1
test/CMakeLists.txt Zobrazit soubor

@@ -26,7 +26,8 @@ add_executable (tester_loader EXCLUDE_FROM_ALL
26 26
 #################################################################
27 27
 
28 28
 add_executable (tester_script EXCLUDE_FROM_ALL
29
-    "Script.cpp" "../src/Script.cpp" "../src/main.cpp"
29
+    "Script.cpp" "ScriptPayload.h" "ScriptTest.h"
30
+    "../src/Script.cpp" "../src/main.cpp"
30 31
     "../src/utils/binary.cpp" "../src/Exception.cpp"
31 32
 )
32 33
 

Loading…
Zrušit
Uložit