SDK launcher defines cleanup

Some of its defines were located in the 'launcher' library directory, but it only contained defines for the SDK launcher, this has been moved to 'sdklauncher_const.h'. Also renamed the 'launcher_pch.h' PCH to 'sdklauncher_pch.h' to avoid confusion with 'launcher' and 'sdklauncher'.

r5dev/launcher/CMakeLists.txt

@@ -6,7 +6,6 @@ start_sources()
 add_sources( SOURCE_GROUP "Runtime"
     "launcher.cpp"
     "launcher.h"
-    "launcherdefs.h"
     "prx.cpp"
     "prx.h"
 )

r5dev/launcher/launcherdefs.h

@@ -1,7 +0,0 @@
-#pragma once
-
-// Change this each time the settings format has changed.
-#define SDK_LAUNCHER_VERSION 1
-
-// Uncomment this line to compile the launcher for dedicated server builds.
-//#define DEDI_LAUNCHER

r5dev/sdklauncher/CMakeLists.txt

@@ -32,7 +32,7 @@ target_compile_definitions( ${PROJECT_NAME} PRIVATE
     "SDKLAUNCHER"
 )
 target_precompile_headers( ${PROJECT_NAME} PRIVATE
-    "launcher_pch.h"
+    "sdklauncher_pch.h"
 )
 target_link_libraries( ${PROJECT_NAME} PRIVATE
     "tier0"

r5dev/sdklauncher/basepanel.cpp

@@ -3,7 +3,6 @@
 // Purpose: Launcher user interface implementation.
 //
 //=============================================================================//
-#include "launcher_pch.h"
 #include "basepanel.h"
 #include "sdklauncher.h"
 #include "mathlib/bits.h"

r5dev/sdklauncher/basepanel.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "sdklauncher_const.h"
 
 struct LogList_t
 {

r5dev/sdklauncher/sdklauncher.cpp

@@ -3,7 +3,6 @@
 // Purpose: SDK launcher implementation.
 //
 //=============================================================================//
-#include "launcher_pch.h"
 #include "tier0/binstream.h"
 #include "basepanel.h"
 #include "sdklauncher.h"

r5dev/sdklauncher/sdklauncher_const.h

@@ -1,5 +1,11 @@
 #pragma once
 
+// Change this each time the settings format has changed.
+#define SDK_LAUNCHER_VERSION 1
+
+// Uncomment this line to compile the launcher for dedicated server builds.
+//#define DEDI_LAUNCHER
+
 #define GAME_CFG_PATH "platform\\cfg\\system\\"
 #define DEFAULT_WINDOW_CLASS_NAME "Respawn001"
 #define LAUNCHER_SETTING_FILE "launcher.vdf"

r5dev/sdklauncher/sdklauncher_pch.h

@@ -15,4 +15,4 @@
 #include "thirdparty/cppnet/cppkore/UIXRadioButton.h"
 #include "thirdparty/cppnet/cppkore/KoreTheme.h"
 
-#include "launcher/launcherdefs.h"
+#include "sdklauncher/sdklauncher_const.h"

r5dev/sdklauncher/sdklauncher_res.h

@@ -2,7 +2,7 @@
 // Microsoft Visual C++ generated include file.
 // Used by r5launch.rc
 //
-#include "../launcher/launcherdefs.h"
+#include "sdklauncher_const.h"
 #define IDI_ICON1                       101
 
 // Next default values for new objects