From 2c0a03704cd171e4cf850a2003b55680d65366b7 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 10 Jul 2018 17:29:05 +0300 Subject: [PATCH] Update mainui. Add --enable-bsp2 switch into wscript --- engine/wscript | 8 ++++++-- mainui | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/engine/wscript b/engine/wscript index 9c7584b8..4be3ff93 100644 --- a/engine/wscript +++ b/engine/wscript @@ -8,8 +8,9 @@ import os top = '.' def options(opt): - # stub - return + opt.add_option( + '--enable-bsp2', action = 'store_true', dest = 'SUPPORT_BSP2_FORMAT', default = False, + help = 'build engine with BSP2 map support(recommended for Quake, breaks compability!)') def configure(conf): # check for dedicated server build @@ -31,6 +32,9 @@ def configure(conf): conf.fatal('SDL2 not availiable! If you want to build dedicated server, specify --dedicated') conf.env.append_unique('DEFINES', 'XASH_SDL') + if(conf.options.SUPPORT_BSP2_FORMAT): + conf.env.append_unique('DEFINES', 'SUPPORT_BSP2_FORMAT') + if conf.env.DEST_OS == 'win32': conf.check( lib='USER32' ) conf.check( lib='SHELL32' ) diff --git a/mainui b/mainui index 0c354a1d..89a82727 160000 --- a/mainui +++ b/mainui @@ -1 +1 @@ -Subproject commit 0c354a1d9c6a7443f85ba4c7a8f93141420f281d +Subproject commit 89a827276eecfeff1c9d97f24913f8757693dbce