YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

game_launch: remove SDL for simplicity

Browse Source
This commit is contained in:
Alibek Omarov 2018-11-18 22:33:12 +03:00
parent 27ee4337fe
commit 2b085cb69e
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
game_launch/game.cpp
View File

@ -15,11 +15,6 @@ GNU General Public License for more details.
#include "port.h" #include "port.h"
#ifdef XASH_SDL
#include <SDL_main.h>
#include <SDL_messagebox.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -69,9 +64,7 @@ static void Xash_Error( const char *szFmt, ... )
vsnprintf( buffer, sizeof(buffer), szFmt, args ); vsnprintf( buffer, sizeof(buffer), szFmt, args );
va_end( args ); va_end( args );
#ifdef XASH_SDL #if defined( _WIN32 )
SDL_ShowSimpleMessageBox( SDL_MESSAGEBOX_ERROR, "Xash Error", buffer, NULL );
#elif defined( _WIN32 )
MessageBoxA( NULL, buffer, "Xash Error", MB_OK ); MessageBoxA( NULL, buffer, "Xash Error", MB_OK );
#else #else
fprintf( stderr, "Xash Error: %s\n", buffer ); fprintf( stderr, "Xash Error: %s\n", buffer );

16
game_launch/wscript
View File

@ -17,19 +17,7 @@ def configure(conf):
# check for dedicated server build # check for dedicated server build
if not conf.env.DEDICATED: if not conf.env.DEDICATED:
if conf.env.DEST_OS != 'win32': # We need SDL2 for showing messagebox in case launcher has failed if conf.env.DEST_OS == 'win32':
# TODO: add way to specify SDL2 path, move to separate function
try:
conf.check_cfg(
path='sdl2-config',
args='--cflags --libs',
package='',
msg='Checking for SDL2',
uselib_store='SDL2')
except conf.errors.ConfigurationError:
conf.fatal('SDL2 not availiable! If you want to build dedicated server, specify --dedicated')
conf.env.append_unique('DEFINES', 'XASH_SDL')
else:
conf.check(lib='USER32') conf.check(lib='USER32')
conf.check(lib='SHELL32') conf.check(lib='SHELL32')
@ -49,8 +37,6 @@ def build(bld):
if bld.env.DEST_OS != 'win32': if bld.env.DEST_OS != 'win32':
libs += [ 'DL' ] libs += [ 'DL' ]
if not bld.env.DEDICATED:
libs += [ 'SDL2' ]
else: else:
# compile resource on Windows # compile resource on Windows
bld.load('winres') bld.load('winres')