FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-22 09:56:22 +01:00
Code Issues 2 Projects Releases Wiki Activity

scripts: waifulib: xcompile: add msvc-wine support in cross-compile helper script

Browse Source
This commit is contained in:
Alibek Omarov 2022-11-16 04:19:46 +03:00
parent 927dccc71d
commit aa702f0678
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/waifulib/xcompile.py
View File

@ -349,13 +349,13 @@ class Android:
return ldflags return ldflags
def options(opt): def options(opt):
android = opt.add_option_group('Android options') xc = opt.add_option_group('Cross compile options')
android.add_option('--android', action='store', dest='ANDROID_OPTS', default=None, xc.add_option('--android', action='store', dest='ANDROID_OPTS', default=None,
help='enable building for android, format: --android=<arch>,<toolchain>,<api>, example: --android=armeabi-v7a-hard,4.9,9') help='enable building for android, format: --android=<arch>,<toolchain>,<api>, example: --android=armeabi-v7a-hard,4.9,9')
xc.add_option('--enable-magx', action='store_true', dest='MAGX', default=False,
magx = opt.add_option_group('MotoMAGX options') help='enable building for Motorola MAGX [default: %default]')
magx.add_option('--enable-magx', action = 'store_true', dest = 'MAGX', default = False, xc.add_option('--enable-msvc-wine', action='store_true', dest='MSVC_WINE', default=False,
help = 'enable targetting for MotoMAGX phones [default: %default]') help='enable building with MSVC using Wine [default: %default]')
def configure(conf): def configure(conf):
if conf.options.ANDROID_OPTS: if conf.options.ANDROID_OPTS:
@ -389,17 +389,28 @@ def configure(conf):
conf.msg('... C/C++ flags', ' '.join(android.cflags()).replace(android.ndk_home, '$NDK/')) conf.msg('... C/C++ flags', ' '.join(android.cflags()).replace(android.ndk_home, '$NDK/'))
conf.msg('... link flags', ' '.join(android.linkflags()).replace(android.ndk_home, '$NDK/')) conf.msg('... link flags', ' '.join(android.linkflags()).replace(android.ndk_home, '$NDK/'))
conf.msg('... ld flags', ' '.join(android.ldflags()).replace(android.ndk_home, '$NDK/')) conf.msg('... ld flags', ' '.join(android.ldflags()).replace(android.ndk_home, '$NDK/'))
# conf.env.ANDROID_OPTS = android
conf.env.DEST_OS2 = 'android'
elif conf.options.MAGX: elif conf.options.MAGX:
# useless to change toolchain path, as toolchain meant to be placed in this path # useless to change toolchain path, as toolchain meant to be placed in this path
toolchain_path = '/opt/toolchains/motomagx/arm-eabi2/lib/' toolchain_path = '/opt/toolchains/motomagx/arm-eabi2/lib/'
conf.env.INCLUDES_MAGX = [toolchain_path + i for i in ['ezx-z6/include', 'qt-2.3.8/include']] conf.env.INCLUDES_MAGX = [toolchain_path + i for i in ['ezx-z6/include', 'qt-2.3.8/include']]
conf.env.LIBPATH_MAGX = [toolchain_path + i for i in ['ezx-z6/lib', 'qt-2.3.8/lib']] conf.env.LIBPATH_MAGX = [toolchain_path + i for i in ['ezx-z6/lib', 'qt-2.3.8/lib']]
conf.env.LINKFLAGS_MAGX = ['-Wl,-rpath-link=' + i for i in conf.env.LIBPATH_MAGX] conf.env.LINKFLAGS_MAGX = ['-Wl,-rpath-link=' + i for i in conf.env.LIBPATH_MAGX]
elif conf.options.MSVC_WINE:
try:
toolchain_path = conf.environ['MSVC_WINE_PATH']
except KeyError:
conf.fatal('Set MSVC_WINE_PATH environment variable to the MSVC toolchain root!')
conf.environ['CC'] = conf.environ['CXX'] = os.path.join(toolchain_path, 'bin', conf.env.MSVC_TARGETS[0], 'cl')
conf.environ['LINK_CXX'] = os.path.join(toolchain_path, 'bin', conf.env.MSVC_TARGETS[0], 'link')
conf.environ['AR'] = os.path.join(toolchain_path, 'bin', conf.env.MSVC_TARGETS[0], 'lib')
conf.environ['WINRC'] = os.path.join(toolchain_path, 'bin', conf.env.MSVC_TARGETS[0], 'rc')
conf.env.DEST_OS = 'win32'
conf.env.DEST_CPU = conf.env.MSVC_TARGETS[0]
conf.env.COMPILER_CXX = conf.env.COMPILER_CC = 'msvc'
conf.env.MAGX = conf.options.MAGX conf.env.MAGX = conf.options.MAGX
conf.env.MSVC_WINE = conf.options.MSVC_WINE
MACRO_TO_DESTOS = OrderedDict({ '__ANDROID__' : 'android' }) MACRO_TO_DESTOS = OrderedDict({ '__ANDROID__' : 'android' })
for k in c_config.MACRO_TO_DESTOS: for k in c_config.MACRO_TO_DESTOS:
MACRO_TO_DESTOS[k] = c_config.MACRO_TO_DESTOS[k] # ordering is important MACRO_TO_DESTOS[k] = c_config.MACRO_TO_DESTOS[k] # ordering is important
@ -433,11 +444,17 @@ compiler_cxx_configure = getattr(compiler_cxx, 'configure')
compiler_c_configure = getattr(compiler_c, 'configure') compiler_c_configure = getattr(compiler_c, 'configure')
def patch_compiler_cxx_configure(conf): def patch_compiler_cxx_configure(conf):
compiler_cxx_configure(conf) if not conf.env.MSVC_WINE:
compiler_cxx_configure(conf)
else:
conf.load('msvc', funs='no_autodetect')
post_compiler_cxx_configure(conf) post_compiler_cxx_configure(conf)
def patch_compiler_c_configure(conf): def patch_compiler_c_configure(conf):
compiler_c_configure(conf) if not conf.env.MSVC_WINE:
compiler_c_configure(conf)
else:
conf.load('msvc', funs='no_autodetect')
post_compiler_c_configure(conf) post_compiler_c_configure(conf)
setattr(compiler_cxx, 'configure', patch_compiler_cxx_configure) setattr(compiler_cxx, 'configure', patch_compiler_cxx_configure)