xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix dedicated server build

Browse source
This commit is contained in:
nillerusr 2021-04-27 23:33:46 +03:00
parent c1c616e569
commit c70e496e72
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
appframework/sdlmgr.cpp
View file

@ -4,8 +4,10 @@
// //
//=============================================================================// //=============================================================================//
#ifdef USE_SDL
#include "SDL.h" #include "SDL.h"
#include "SDL_opengl.h" #include "SDL_opengl.h"
#endif
#include "appframework/ilaunchermgr.h" #include "appframework/ilaunchermgr.h"
#include "inputsystem/ButtonCode.h" #include "inputsystem/ButtonCode.h"
@ -66,7 +68,7 @@ that Apple unhelpfully clamps you to vsync in this scenario, which would
explain the 60fps max. explain the 60fps max.
There are a few options: There are a few options:
- SDL_WINDOW_FULLSCREEN mode will not use this new magic (only - SDL_WAINDOW_FULLSCREEN mode will not use this new magic (only
SDL_WINDOW_FULLSCREEN_DESKTOP), but that brings other problems and I SDL_WINDOW_FULLSCREEN_DESKTOP), but that brings other problems and I
wouldn't recommend a drastic change like that. wouldn't recommend a drastic change like that.

3
engine/host.cpp
View file

@ -127,8 +127,11 @@
#endif #endif
#if defined( LINUX ) #if defined( LINUX )
#include <locale.h> #include <locale.h>
#ifdef USE_SDL
#include "SDL.h" #include "SDL.h"
#endif #endif
#endif
#include "ixboxsystem.h" #include "ixboxsystem.h"
extern IXboxSystem *g_pXboxSystem; extern IXboxSystem *g_pXboxSystem;

6
tier0/assert_dialog.cpp
View file

@ -23,7 +23,7 @@
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
#if defined( LINUX ) || defined( USE_SDL ) #if defined( USE_SDL )
// We lazily load the SDL shared object, and only reference functions if it's // We lazily load the SDL shared object, and only reference functions if it's
// available, so this can be included on the dedicated server too. // available, so this can be included on the dedicated server too.
@ -357,7 +357,7 @@ DBG_INTERFACE void SetAllAssertsDisabled( bool bAssertsDisabled )
g_bAssertsEnabled = !bAssertsDisabled; g_bAssertsEnabled = !bAssertsDisabled;
} }
#if defined( LINUX ) || defined( USE_SDL ) #if defined( USE_SDL )
SDL_Window *g_SDLWindow = NULL; SDL_Window *g_SDLWindow = NULL;
DBG_INTERFACE void SetAssertDialogParent( struct SDL_Window *window ) DBG_INTERFACE void SetAssertDialogParent( struct SDL_Window *window )
@ -534,7 +534,7 @@ DBG_INTERFACE bool DoNewAssertDialog( const tchar *pFilename, int line, const tc
DialogBox( g_hTier0Instance, MAKEINTRESOURCE( IDD_ASSERT_DIALOG ), hParentWindow, AssertDialogProc ); DialogBox( g_hTier0Instance, MAKEINTRESOURCE( IDD_ASSERT_DIALOG ), hParentWindow, AssertDialogProc );
} }
#elif defined( POSIX ) #elif defined( POSIX ) && defined ( USE_SDL )
static FUNC_SDL_ShowMessageBox *pfnSDLShowMessageBox = NULL; static FUNC_SDL_ShowMessageBox *pfnSDLShowMessageBox = NULL;
if( !pfnSDLShowMessageBox ) if( !pfnSDLShowMessageBox )
{ {