diff --git a/r5dev/core/stdafx.h b/r5dev/core/stdafx.h index 203fd8ec..1c1e5d26 100644 --- a/r5dev/core/stdafx.h +++ b/r5dev/core/stdafx.h @@ -48,6 +48,8 @@ #include "thirdparty/cppnet/cppkore/UIXButton.h" #include "thirdparty/cppnet/cppkore/UIXRadioButton.h" #include "thirdparty/cppnet/cppkore/KoreTheme.h" + +#include "launcher/launcherdefs.h" #endif // SDKLAUNCHER #if !defined(DEDICATED) && !defined(SDKLAUNCHER) && !defined (NETCONSOLE) diff --git a/r5dev/launcher/launcherdefs.h b/r5dev/launcher/launcherdefs.h new file mode 100644 index 00000000..1fc1be89 --- /dev/null +++ b/r5dev/launcher/launcherdefs.h @@ -0,0 +1,4 @@ +#pragma once + +// Uncomment this line to compile the launcher for dedicated server builds. +//#define DEDI_LAUNCHER diff --git a/r5dev/resource/sdklauncher.rc b/r5dev/resource/sdklauncher.rc index b650fb02..947d837f 100644 --- a/r5dev/resource/sdklauncher.rc +++ b/r5dev/resource/sdklauncher.rc @@ -1,9 +1,8 @@ // Microsoft Visual C++ generated resource script. // -#define USE_RES -//#define RELEASE -#ifdef USE_RES #include "sdklauncher/sdklauncher_res.h" +//#define RELEASE +#ifndef DEDI_LAUNCHER #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -75,5 +74,5 @@ IDI_ICON1 ICON "resource\\ico\\sdklauncher_dbg. #endif // !APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// -#endif // !USE_RES +#endif // !DEDI_LAUNCHER diff --git a/r5dev/sdklauncher/basepanel.cpp b/r5dev/sdklauncher/basepanel.cpp index 50635482..8fab9896 100644 --- a/r5dev/sdklauncher/basepanel.cpp +++ b/r5dev/sdklauncher/basepanel.cpp @@ -493,6 +493,10 @@ void CUIBaseSurface::Setup() this->m_ModeCombo->Items.Add("Server"); this->m_ModeCombo->Items.Add("Client"); +#ifdef DEDI_LAUNCHER + this->m_ModeCombo->SetSelectedIndex(1); +#endif // DEDI_LAUNCHER + this->m_VisibilityCombo->Items.Add("Public"); this->m_VisibilityCombo->Items.Add("Hidden"); this->m_VisibilityCombo->Items.Add("Offline"); diff --git a/r5dev/sdklauncher/sdklauncher_res.h b/r5dev/sdklauncher/sdklauncher_res.h index cd449a78..f37d4afb 100644 --- a/r5dev/sdklauncher/sdklauncher_res.h +++ b/r5dev/sdklauncher/sdklauncher_res.h @@ -2,6 +2,7 @@ // Microsoft Visual C++ generated include file. // Used by r5launch.rc // +#include "launcher/launcherdefs.h" #define IDI_ICON1 101 // Next default values for new objects diff --git a/r5dev/vproj/sdklauncher.vcxproj b/r5dev/vproj/sdklauncher.vcxproj index b9acd875..4a8aa099 100644 --- a/r5dev/vproj/sdklauncher.vcxproj +++ b/r5dev/vproj/sdklauncher.vcxproj @@ -139,6 +139,7 @@ + diff --git a/r5dev/vproj/sdklauncher.vcxproj.filters b/r5dev/vproj/sdklauncher.vcxproj.filters index 0871ceb3..db3e53a8 100644 --- a/r5dev/vproj/sdklauncher.vcxproj.filters +++ b/r5dev/vproj/sdklauncher.vcxproj.filters @@ -74,6 +74,9 @@ launcher + + launcher +