From e7ac2fe7410a932774a8af9ff6649f570e6a68fb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 4 Jan 2024 20:43:54 +0100 Subject: [PATCH] moved launcher window out of common. This needs to be different for Raze so it cannot be in shared code. --- src/CMakeLists.txt | 6 +++++- src/common/platform/win32/i_system.cpp | 2 +- src/{common/widgets => launcher}/launcherwindow.cpp | 0 src/{common/widgets => launcher}/launcherwindow.h | 0 4 files changed, 6 insertions(+), 2 deletions(-) rename src/{common/widgets => launcher}/launcherwindow.cpp (100%) rename src/{common/widgets => launcher}/launcherwindow.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index be3166189e..afc3686b89 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -617,6 +617,7 @@ file( GLOB HEADER_FILES common/scripting/frontend/*.h utility/*.h + launcher/*.h scripting/*.h scripting/backend/*.h scripting/decorate/*.h @@ -976,6 +977,8 @@ set (PCH_SOURCES rendering/swrenderer/textures/warptexture.cpp rendering/swrenderer/textures/swcanvastexture.cpp events.cpp + launcher/launcherwindow.cpp + common/audio/sound/i_sound.cpp common/audio/sound/oalsound.cpp common/audio/sound/s_environment.cpp @@ -999,7 +1002,6 @@ set (PCH_SOURCES common/startscreen/startscreen_strife.cpp common/startscreen/startscreen_generic.cpp common/startscreen/endoom.cpp - common/widgets/launcherwindow.cpp common/widgets/errorwindow.cpp common/widgets/netstartwindow.cpp common/widgets/widgetresourcedata.cpp @@ -1329,6 +1331,7 @@ include_directories( scripting scripting/zscript rendering + launcher ../libraries/ZVulkan/include ../libraries/ZWidget/include ${SYSTEM_SOURCES_DIR} @@ -1534,6 +1537,7 @@ source_group("Utility\\Smackerdec" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_D source_group("Utility\\Smackerdec\\Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/libsmackerdec/include/.+") source_group("Utility\\Smackerdec\\Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/libsmackerdec/src/.+") source_group("Statusbar" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_statusbar/.+") +source_group("Launcher" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/launcher/.+") source_group("Versioning" FILES version.h win32/zdoom.rc) source_group("Xlat" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/xlat/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.h) source_group("Source Files" FILES ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h common/engine/sc_man_scanner.re) diff --git a/src/common/platform/win32/i_system.cpp b/src/common/platform/win32/i_system.cpp index b6ea656e78..58cfa3c34b 100644 --- a/src/common/platform/win32/i_system.cpp +++ b/src/common/platform/win32/i_system.cpp @@ -87,7 +87,7 @@ #include "i_interface.h" #include "i_mainwindow.h" -#include "common/widgets/launcherwindow.h" +#include "launcherwindow.h" // MACROS ------------------------------------------------------------------ diff --git a/src/common/widgets/launcherwindow.cpp b/src/launcher/launcherwindow.cpp similarity index 100% rename from src/common/widgets/launcherwindow.cpp rename to src/launcher/launcherwindow.cpp diff --git a/src/common/widgets/launcherwindow.h b/src/launcher/launcherwindow.h similarity index 100% rename from src/common/widgets/launcherwindow.h rename to src/launcher/launcherwindow.h