diff --git a/engine/common/dedicated.c b/engine/common/dedicated.c index e89f96ef..38bdace1 100644 --- a/engine/common/dedicated.c +++ b/engine/common/dedicated.c @@ -312,7 +312,7 @@ void SCR_CheckStartupVids() } -void Sys_SetClipboardData( const byte *text, size_t size ) +void Sys_SetClipboardData( const char *text, size_t size ) { } diff --git a/wscript b/wscript index 79dd2717..149ef53a 100644 --- a/wscript +++ b/wscript @@ -55,7 +55,7 @@ def options(opt): grp.add_option('--enable-bsp2', action = 'store_true', dest = 'SUPPORT_BSP2_FORMAT', default = False, help = 'build engine and renderers with BSP2 map support(recommended for Quake, breaks compability!)') - + opt.load('subproject') opt.add_subproject(subdirs()) @@ -115,7 +115,7 @@ def configure(conf): conf.env.BIT32_ALLOW64 = True conf.env.BIT32_MANDATORY = not conf.env.BIT32_ALLOW64 conf.load('force_32bit') - if conf.env.DEST_OS2 != 'android': + if conf.env.DEST_OS2 != 'android' and not conf.options.DEDICATED: conf.load('sdl2') linker_flags = {