|
|
@ -388,8 +388,6 @@ def configure(conf): |
|
|
|
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] |
|
|
|
for lib in ['qte-mt', 'ezxappbase', 'ezxpm', 'log_util']: |
|
|
|
|
|
|
|
conf.check_cc(lib=lib, use='MAGX', uselib_store='MAGX') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
conf.env.MAGX = conf.options.MAGX |
|
|
|
conf.env.MAGX = conf.options.MAGX |
|
|
|
MACRO_TO_DESTOS = OrderedDict({ '__ANDROID__' : 'android' }) |
|
|
|
MACRO_TO_DESTOS = OrderedDict({ '__ANDROID__' : 'android' }) |
|
|
@ -406,6 +404,10 @@ def post_compiler_cxx_configure(conf): |
|
|
|
if conf.android.ndk_rev == 19: |
|
|
|
if conf.android.ndk_rev == 19: |
|
|
|
conf.env.CXXFLAGS_cxxshlib += ['-static-libstdc++'] |
|
|
|
conf.env.CXXFLAGS_cxxshlib += ['-static-libstdc++'] |
|
|
|
conf.env.LDFLAGS_cxxshlib += ['-static-libstdc++'] |
|
|
|
conf.env.LDFLAGS_cxxshlib += ['-static-libstdc++'] |
|
|
|
|
|
|
|
elif conf.options.MAGX: |
|
|
|
|
|
|
|
for lib in ['qte-mt', 'ezxappbase', 'ezxpm', 'log_util']: |
|
|
|
|
|
|
|
conf.check_cc(lib=lib, use='MAGX', uselib_store='MAGX') |
|
|
|
|
|
|
|
|
|
|
|
return |
|
|
|
return |
|
|
|
|
|
|
|
|
|
|
|
def post_compiler_c_configure(conf): |
|
|
|
def post_compiler_c_configure(conf): |
|
|
|