Separate out the remaining files.

src/CMakeData-file-types.cmake

@@ -0,0 +1,18 @@
+list(APPEND SMDATA_FILE_TYPES_SRC
+  "CsvFile.cpp"
+  "IniFile.cpp"
+  "MsdFile.cpp"
+  "XmlFile.cpp"
+  "XmlToLua.cpp"
+  "XmlFileUtil.cpp"
+)
+list(APPEND SMDATA_FILE_TYPES_HPP
+  "CsvFile.h"
+  "IniFile.h"
+  "MsdFile.h"
+  "XmlFile.h"
+  "XmlToLua.h"
+  "XmlFileUtil.h"
+)
+
+source_group("File Types" FILES ${SMDATA_FILE_TYPES_SRC} ${SMDATA_FILE_TYPES_HPP})

src/CMakeData-globals.cmake

@@ -0,0 +1,19 @@
+list(APPEND SMDATA_GLOBAL_FILES_SRC
+  "GameLoop.cpp"
+  "global.cpp"
+  "SpecialFiles.cpp"
+  "StepMania.cpp" # TODO: Refactor into separate main project.
+  "${SM_SRC_DIR}/generated/verstub.cpp"
+)
+
+list(APPEND SMDATA_GLOBAL_FILES_HPP
+  "generated/config.hpp"
+  "GameLoop.h"
+  "global.h"
+  "ProductInfo.h" # TODO: Have this be auto-generated.
+  "SpecialFiles.h"
+  "StdString.h" # TODO: Remove the need for this file, transition to std::string.
+  "StepMania.h" # TODO: Refactor into separate main project.
+)
+
+source_group("Global Files" FILES ${SMDATA_GLOBAL_FILES_SRC} ${SMDATA_GLOBAL_FILES_HPP})

src/CMakeData-singletons.cmake

@@ -0,0 +1,65 @@
+list(APPEND SMDATA_GLOBAL_SINGLETON_SRC
+  "AnnouncerManager.cpp"
+  "Bookkeeper.cpp"
+  "CharacterManager.cpp"
+  "CommandLineActions.cpp"
+  "CryptManager.cpp"
+  "FontManager.cpp"
+  "GameManager.cpp"
+  "GameSoundManager.cpp"
+  "GameState.cpp"
+  "InputFilter.cpp"
+  "InputMapper.cpp"
+  "InputQueue.cpp"
+  "LightsManager.cpp"
+  "LuaManager.cpp"
+  "MemoryCardManager.cpp"
+  "MessageManager.cpp"
+  "NetworkSyncManager.cpp"
+  "NoteSkinManager.cpp"
+  "PrefsManager.cpp"
+  "ProfileManager.cpp"
+  "ScreenManager.cpp"
+  "SongManager.cpp"
+  "StatsManager.cpp"
+  "ThemeManager.cpp"
+  "UnlockManager.cpp"
+)
+list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
+  "AnnouncerManager.h"
+  "Bookkeeper.h"
+  "CharacterManager.h"
+  "CommandLineActions.h"
+  "CryptManager.h"
+  "FontManager.h"
+  "GameManager.h"
+  "GameSoundManager.h"
+  "GameState.h"
+  "InputFilter.h"
+  "InputMapper.h"
+  "InputQueue.h"
+  "LightsManager.h"
+  "LuaManager.h"
+  "MemoryCardManager.h"
+  "MessageManager.h"
+  "NetworkSyncManager.h"
+  "NoteSkinManager.h"
+  "PrefsManager.h"
+  "ProfileManager.h"
+  "ScreenManager.h"
+  "SongManager.h"
+  "StatsManager.h"
+  "ThemeManager.h"
+  "UnlockManager.h"
+)
+
+if(WITH_NETWORKING)
+  list(APPEND SMDATA_GLOBAL_SINGLETON_SRC
+    "ezsockets.cpp"
+  )
+  list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
+    "ezsockets.h"
+  )
+endif()
+
+source_group("Global Singletons" FILES ${SMDATA_GLOBAL_SINGLETON_SRC} ${SMDATA_GLOBAL_SINGLETON_HPP})

src/CMakeLists.txt

@@ -5,31 +5,11 @@ if(MSVC)
   include("CMakeProject-mapconv.cmake")
 endif()
 
-# Main project is below.
-
-list(APPEND SMDATA_GLOBAL_FILES_SRC
-  "GameLoop.cpp"
-  "global.cpp"
-  "SpecialFiles.cpp"
-  "StepMania.cpp" # TODO: Refactor into separate main project.
-  "${SM_SRC_DIR}/generated/verstub.cpp"
-)
-
-list(APPEND SMDATA_GLOBAL_FILES_HPP
-  "generated/config.hpp"
-  "GameLoop.h"
-  "global.h"
-  "ProductInfo.h" # TODO: Have this be auto-generated.
-  "SpecialFiles.h"
-  "StdString.h" # TODO: Remove the need for this file, transition to std::string.
-  "StepMania.h" # TODO: Refactor into separate main project.
-)
-
-source_group("Global Files" FILES ${SMDATA_GLOBAL_FILES_SRC} ${SMDATA_GLOBAL_FILES_HPP})
-
 # Keep the module path local for easier grabbing.
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
+# Main project is below.
+
 include(CMakeData-arch.cmake)
 include(CMakeData-rage.cmake)
 include(CMakeData-os.cmake)
@@ -37,89 +17,9 @@ include(CMakeData-actor.cmake)
 include(CMakeData-screen.cmake)
 include(CMakeData-data.cmake)
 include(CMakeData-gtk.cmake)
-
+include(CMakeData-file-types.cmake)
-list(APPEND SMDATA_GLOBAL_SINGLETON_SRC
+include(CMakeData-globals.cmake)
-  "AnnouncerManager.cpp"
+include(CMakeData-singletons.cmake)
-  "Bookkeeper.cpp"
-  "CharacterManager.cpp"
-  "CommandLineActions.cpp"
-  "CryptManager.cpp"
-  "FontManager.cpp"
-  "GameManager.cpp"
-  "GameSoundManager.cpp"
-  "GameState.cpp"
-  "InputFilter.cpp"
-  "InputMapper.cpp"
-  "InputQueue.cpp"
-  "LightsManager.cpp"
-  "LuaManager.cpp"
-  "MemoryCardManager.cpp"
-  "MessageManager.cpp"
-  "NetworkSyncManager.cpp"
-  "NoteSkinManager.cpp"
-  "PrefsManager.cpp"
-  "ProfileManager.cpp"
-  "ScreenManager.cpp"
-  "SongManager.cpp"
-  "StatsManager.cpp"
-  "ThemeManager.cpp"
-  "UnlockManager.cpp"
-)
-list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
-  "AnnouncerManager.h"
-  "Bookkeeper.h"
-  "CharacterManager.h"
-  "CommandLineActions.h"
-  "CryptManager.h"
-  "FontManager.h"
-  "GameManager.h"
-  "GameSoundManager.h"
-  "GameState.h"
-  "InputFilter.h"
-  "InputMapper.h"
-  "InputQueue.h"
-  "LightsManager.h"
-  "LuaManager.h"
-  "MemoryCardManager.h"
-  "MessageManager.h"
-  "NetworkSyncManager.h"
-  "NoteSkinManager.h"
-  "PrefsManager.h"
-  "ProfileManager.h"
-  "ScreenManager.h"
-  "SongManager.h"
-  "StatsManager.h"
-  "ThemeManager.h"
-  "UnlockManager.h"
-)
-
-if(WITH_NETWORKING)
-  list(APPEND SMDATA_GLOBAL_SINGLETON_SRC
-    "ezsockets.cpp"
-  )
-  list(APPEND SMDATA_GLOBAL_SINGLETON_HPP
-    "ezsockets.h"
-  )
-endif()
-
-source_group("Global Singletons" FILES ${SMDATA_GLOBAL_SINGLETON_SRC} ${SMDATA_GLOBAL_SINGLETON_HPP})
-
-list(APPEND SMDATA_FILE_TYPES_SRC
-  "IniFile.cpp"
-  "MsdFile.cpp"
-  "XmlFile.cpp"
-  "XmlToLua.cpp"
-  "XmlFileUtil.cpp"
-)
-list(APPEND SMDATA_FILE_TYPES_HPP
-  "IniFile.h"
-  "MsdFile.h"
-  "XmlFile.h"
-  "XmlToLua.h"
-  "XmlFileUtil.h"
-)
-
-source_group("File Types" FILES ${SMDATA_FILE_TYPES_SRC} ${SMDATA_FILE_TYPES_HPP})
 
 list(APPEND SMDATA_ALL_FILES_SRC
   ${SMDATA_GLOBAL_FILES_SRC}