Merge branch 'master' into sewer_beta

Author: nekonomicon

android/app/src/main/java/su/xash/hlsdk/MainActivity.java

@@ -21,7 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 pkg = "su.xash.engine";
                 getPackageManager().getPackageInfo(pkg, 0);
             } catch (PackageManager.NameNotFoundException ex) {
-                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=su.xash.engine")).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous")).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
                 finish();
                 return;
             }
@@ -34,4 +34,4 @@ protected void onCreate(Bundle savedInstanceState) {
                 .putExtra("package", getPackageName()));
         finish();
     }
-}
+}

cmake/LibraryNaming.cmake

@@ -62,6 +62,7 @@ check_group_build_target(XASH_ARM XASH_ARCHITECTURE)
 check_group_build_target(XASH_MIPS XASH_ARCHITECTURE)
 check_group_build_target(XASH_PPC XASH_ARCHITECTURE)
 check_group_build_target(XASH_JS XASH_ARCHITECTURE)
+check_group_build_target(XASH_WASM XASH_ARCHITECTURE)
 check_group_build_target(XASH_E2K XASH_ARCHITECTURE)
 check_group_build_target(XASH_RISCV XASH_ARCHITECTURE)
 check_group_build_target(XASH_LITTLE_ENDIAN XASH_ENDIANNESS)
@@ -184,6 +185,12 @@ elseif(XASH_PPC)
 	if(XASH_LITTLE_ENDIAN)
 		set(BUILDARCH "${BUILDARCH}el")
 	endif()
+elseif(XASH_WASM)
+	if(XASH_64BIT)
+		set(BUILDARCH "wasm64")
+	else()
+		set(BUILDARCH "wasm32")
+	endif()
 else()
 	message(SEND_ERROR "Place your architecture name here! If this is a mistake, try to fix conditions above and report a bug")
 endif()

public/build.h

@@ -97,8 +97,6 @@ Then you can use another oneliner to query all variables:
 //================================================================
 #if defined _WIN32
 	#define XASH_WIN32 1
-#elif defined __EMSCRIPTEN__
-	#define XASH_EMSCRIPTEN 1
 #elif defined __WATCOMC__ && defined __DOS__
 	#define XASH_DOS4GW 1
 #else // POSIX compatible
@@ -137,6 +135,8 @@ Then you can use another oneliner to query all variables:
 		#define XASH_WASI 1
 	#elif defined __sun__
 		#define XASH_SUNOS 1
+	#elif defined __EMSCRIPTEN__
+		#define XASH_EMSCRIPTEN 1
 	#else
 		#error
 	#endif
@@ -194,8 +194,9 @@ Then you can use another oneliner to query all variables:
 	#define XASH_ARM   8
 #elif defined __mips__
 	#define XASH_MIPS 1
-#elif defined __EMSCRIPTEN__
-	#define XASH_JS 1
+// commented out to avoid misdetection, modern Emscripten versions target WASM only
+//#elif defined __EMSCRIPTEN__
+//	#define XASH_JS 1
 #elif defined __e2k__
 	#define XASH_64BIT 1
 	#define XASH_E2K 1

scripts/waifulib/c_emscripten.py

@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 vi:ts=4:noexpandtab
+
+from waflib.Tools import ccroot, gcc, gxx
+from waflib.Configure import conf
+from waflib.TaskGen import feature, after_method
+from waflib import Utils
+
+@conf
+def get_emscripten_version(conf, cc):
+	k = conf.get_cc_version(cc, clang=True)
+
+	if '__EMSCRIPTEN__' not in k:
+		conf.fatal('Could not determine the emscripten compiler version')
+
+	conf.env.DEST_OS = 'emscripten'
+	conf.env.DEST_CPU = 'wasm'
+
+@conf
+def find_emcc(conf):
+	cc = conf.find_program(['emcc'], var='CC')
+	conf.get_emscripten_version(cc)
+	conf.env.CC_NAME = 'clang'
+
+@conf
+def find_emxx(conf):
+	cxx = conf.find_program(['em++'], var='CXX')
+	conf.get_emscripten_version(cxx)
+	conf.env.CXX_NAME = 'clang'
+
+@conf
+def gcc_modifier_emscripten(conf):
+	v = conf.env
+
+	conf.env.cshlib_PATTERN = 'lib%s.wasm'
+	conf.env.cprogram_PATTERN = '%s.html'
+
+	conf.env.CFLAGS_cshlib = ['-fPIC', '-sSIDE_MODULE=1']
+	conf.env.CFLAGS_cstlib = ['-fPIC']
+	conf.env.CFLAGS_cprogram = ['-sMAIN_MODULE=1']
+
+	conf.env.LINKFLAGS_cshlib = ['-sSIDE_MODULE=1']
+	conf.env.LINKFLAGS_cprogram = ['-sMAIN_MODULE=1']
+
+@conf
+def gxx_modifier_emscripten(conf):
+	v = conf.env
+
+	conf.env.cxxshlib_PATTERN = 'lib%s.wasm'
+	conf.env.cxxprogram_PATTERN = '%s.html'
+	conf.env.CXXFLAGS_cxxshlib = ['-fPIC', '-sSIDE_MODULE=1']
+	conf.env.CXXFLAGS_cxxstlib = ['-fPIC']
+	conf.env.CXXFLAGS_cxxprogram = ['-sMAIN_MODULE=1']
+
+	conf.env.LINKFLAGS_cxxshlib = ['-sSIDE_MODULE=1']
+	conf.env.LINKFLAGS_cxxprogram = ['-sMAIN_MODULE=1']
+
+@feature('cxxprogram', 'cprogram')
+@after_method('apply_link')
+def apply_indexhtml(self):
+	if self.env.DEST_OS != 'emscripten':
+		return
+
+	tsk = self.link_task
+	node = tsk.outputs[0]
+
+	tsk.outputs.append(node.change_ext('.js'))
+	tsk.outputs.append(node.change_ext('.wasm'))
+
+	if '--preload-file' in getattr(self, 'linkflags', []) + self.env.LINKFLAGS:
+		tsk.outputs.append(node.change_ext('.data'))
+
+	inst_to = getattr(self, 'special_install_path', None)
+	if inst_to:
+		self.add_install_as(install_to=inst_to + '/index.html',
+			install_from=tsk.outputs[0], chmod=Utils.O644, task=tsk)
+
+		self.add_install_files(install_to=inst_to,
+			install_from=tsk.outputs[1:], chmod=Utils.O644, task=tsk)
+
+def configure(conf):
+	if not conf.env.CC:
+		conf.find_emcc()
+		conf.gcc_common_flags()
+		conf.gcc_modifier_platform()
+		conf.cc_load_tools()
+		conf.cc_add_flags()
+		conf.link_add_flags()
+
+	if not conf.env.AR:
+		conf.find_program(['emar'], var='AR')
+		conf.find_ar()
+
+	if not conf.env.CXX:
+		conf.find_emxx()
+		conf.gxx_common_flags()
+		conf.gxx_modifier_platform()
+		conf.cxx_load_tools()
+		conf.cxx_add_flags()
+		conf.link_add_flags()

scripts/waifulib/compiler_optimizations.py

@@ -30,7 +30,7 @@
 }
 '''
 
-VALID_BUILD_TYPES = ['fastnative', 'fast', 'humanrights', 'debug', 'sanitize', 'msan', 'none']
+VALID_BUILD_TYPES = ['fastnative', 'fast', 'humanrights', 'debug', 'sanitize', 'msan', 'asan', 'none']
 
 LINKFLAGS = {
 	'common': {
@@ -42,6 +42,11 @@
 		'clang': ['-fsanitize=memory', '-pthread'],
 		'default': ['NO_MSAN_HERE']
 	},
+	'asan': {
+		'clang': ['-fsanitize=address', '-pthread'],
+		'gcc':   ['-fsanitize=address', '-pthread'],
+		'msvc': ['/SAFESEH:NO']
+	},
 	'sanitize': {
 		'clang': ['-fsanitize=undefined', '-fsanitize=address', '-pthread'],
 		'gcc':   ['-fsanitize=undefined', '-fsanitize=address', '-pthread'],
@@ -56,8 +61,8 @@
 	'common': {
 		# disable thread-safe local static initialization for C++11 code, as it cause crashes on Windows XP
 		'msvc':    ['/D_USING_V110_SDK71_', '/FS', '/Zc:threadSafeInit-', '/MT', '/MP', '/Zc:__cplusplus'],
-		'clang':   ['-g', '-gdwarf-2', '-fvisibility=hidden', '-fno-threadsafe-statics'],
-		'gcc':     ['-g', '-fvisibility=hidden'],
+		'clang':   ['-g', '-gdwarf-2', '-fvisibility=hidden', '-fno-threadsafe-statics', '-fasynchronous-unwind-tables'],
+		'gcc':     ['-g', '-fvisibility=hidden', '-fasynchronous-unwind-tables'],
 		'owcc':	   ['-fno-short-enum', '-ffloat-store', '-g3']
 	},
 	'fast': {
@@ -95,6 +100,12 @@
 		'clang':   ['-O2', '-g', '-fno-omit-frame-pointer', '-fsanitize=memory', '-pthread'],
 		'default': ['NO_MSAN_HERE']
 	},
+	'asan': {
+		'msvc':    ['/Od', '/RTC1', '/Zi', '/fsanitize=address'],
+		'gcc':     ['-Og', '-fsanitize=address', '-pthread'],
+		'clang':   ['-Og', '-fsanitize=address', '-pthread'],
+		'default': ['-O0']
+	},
 	'sanitize': {
 		'msvc':    ['/Od', '/RTC1', '/Zi', '/fsanitize=address'],
 		'gcc':     ['-O0', '-fsanitize=undefined', '-fsanitize=address', '-pthread'],
@@ -166,6 +177,9 @@ def options(opt):
 	grp.add_option('--enable-profile', action = 'store_true', dest = 'PROFILE_GENERATE', default = False,
 		help = 'enable profile generating build (stored in xash3d-prof directory) [default: %(default)s]')
 
+	grp.add_option('--enable-limited-debuginfo', action = 'store_true', dest = 'LIMITED_DEBUGINFO', default = False,
+		help = 'only save line debuginfo, useful for release builds [default: %(default)s]')
+
 	grp.add_option('--use-profile', action = 'store', dest = 'PROFILE_USE', default = None,
 		help = 'use profile during build [default: %(default)s]')
 
@@ -229,21 +243,31 @@ def get_optimization_flags(conf):
 		linkflags+= [conf.get_flags_by_compiler(PROFILE_USE_LINKFLAGS, conf.env.COMPILER_CC)[0] % conf.options.PROFILE_USE]
 		cflags   += [conf.get_flags_by_compiler(PROFILE_USE_CFLAGS, conf.env.COMPILER_CC)[0] % conf.options.PROFILE_USE]
 
-	if conf.env.DEST_OS == 'nswitch' and conf.options.BUILD_TYPE == 'debug':
-		# enable remote debugger
-		cflags.append('-DNSWITCH_DEBUG')
+	if conf.env.DEST_OS == 'nswitch':
+		if conf.options.BUILD_TYPE == 'debug':
+			# enable remote debugger
+			cflags.append('-DNSWITCH_DEBUG')
+		# this port don't have stack printing support
+		cflags.remove('-fasynchronous-unwind-tables')
 	elif conf.env.DEST_OS == 'psvita':
 		# this optimization is broken in vitasdk
 		cflags.append('-fno-optimize-sibling-calls')
 		# remove fvisibility to allow everything to be exported by default
 		cflags.remove('-fvisibility=hidden')
+		# this port don't have stack printing support
+		cflags.remove('-fasynchronous-unwind-tables')
 
-	if conf.env.COMPILER_CC != 'msvc' and conf.env.COMPILER_CC != 'owcc':
+	if conf.env.COMPILER_CC in ['gcc', 'clang'] and conf.options.LIMITED_DEBUGINFO:
+		# probably not a good idea to do this, but it should save space on Android builds especially
+		# that are never going to be run under debugger, but we still want that readable fileline
+		# info in backtraces
+		# might enable this for release/fast/fastnative builds in the future
+		cflags = ['-gline-tables-only' if flag.startswith('-g') else flag for flag in cflags]
+
+	if conf.env.COMPILER_CC in ['gcc', 'clang'] and conf.env.DEST_OS not in ['android']:
 		# HLSDK by default compiles with these options under Linux
 		# no reason for us to not do the same
-
-		# TODO: fix DEST_CPU in force 32 bit mode
-		if conf.env.DEST_CPU == 'x86' or (conf.env.DEST_CPU == 'x86_64' and conf.env.DEST_SIZEOF_VOID_P == 4):
+		if conf.env.DEST_CPU == 'x86':
 			cflags.append('-march=pentium-m')
 			cflags.append('-mtune=core2')
 

scripts/waifulib/library_naming.py

@@ -62,6 +62,7 @@
 'XASH_NSWITCH',
 'XASH_PSVITA',
 'XASH_WASI',
+'XASH_WASM',
 'XASH_SUNOS',
 ]
 
@@ -164,6 +165,12 @@ def configure(conf):
 			buildarch += "64"
 		if conf.env.XASH_LITTLE_ENDIAN:
 			buildarch += "el"
+	elif conf.env.XASH_WASM:
+		buildarch = "wasm"
+		if conf.env.XASH_64BIT:
+			buildarch += "64"
+		else:
+			buildarch += "32"
 	else:
 		raise conf.fatal("Place your architecture name in build.h and library_naming.py!\n"
 			"If this is a mistake, try to fix conditions above and report a bug")