matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make compiler flags a smidgeon less messy

Browse Source
This commit is contained in:
Tamás Bálint Misius 2021-02-15 18:07:32 +01:00
parent dc03808313
commit a2b749b09d
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
meson.build
View File

@ -10,10 +10,6 @@ to_array = generator(
cpp_compiler = meson.get_compiler('cpp') cpp_compiler = meson.get_compiler('cpp')
project_c_args = []
project_cpp_args = []
project_link_args = []
conf_data = configuration_data() conf_data = configuration_data()
conf_data.set('CURL_STATICLIB', false) conf_data.set('CURL_STATICLIB', false)
conf_data.set('ZLIB_WINAPI', false) conf_data.set('ZLIB_WINAPI', false)
@ -103,6 +99,9 @@ threads_dep = dependency('threads')
zlib_dep = use_tpt_libs != 'no' ? tpt_libs.get_variable('zlib_dep') : dependency('zlib', static: uopt_static == 'system') zlib_dep = use_tpt_libs != 'no' ? tpt_libs.get_variable('zlib_dep') : dependency('zlib', static: uopt_static == 'system')
sdl2_dep = use_tpt_libs != 'no' ? tpt_libs.get_variable('sdl2_dep') : dependency('sdl2', static: uopt_static == 'system') sdl2_dep = use_tpt_libs != 'no' ? tpt_libs.get_variable('sdl2_dep') : dependency('sdl2', static: uopt_static == 'system')
project_link_args = []
project_c_args = []
project_cpp_args = []
if copt_msvc if copt_msvc
if uopt_x86_sse_level >= 30 if uopt_x86_sse_level >= 30
message('SSE3 configured to be enabled but unavailable in msvc') message('SSE3 configured to be enabled but unavailable in msvc')
@ -112,31 +111,37 @@ if copt_msvc
message('local machine optimization configured to be enabled but unavailable in msvc') message('local machine optimization configured to be enabled but unavailable in msvc')
uopt_native = false uopt_native = false
endif endif
args_msvc = [
'/GS',
'-D_SCL_SECURE_NO_WARNINGS',
]
if copt_64bit if copt_64bit
message('SSE explicitly configured but unavailable in msvc targeting 64-bit machines') message('SSE explicitly configured but unavailable in msvc targeting 64-bit machines')
else else
args_msvc_sse = []
if uopt_x86_sse_level >= 20 if uopt_x86_sse_level >= 20
args_msvc_sse += '/arch:SSE2' args_msvc += [ '/arch:SSE2' ]
elif uopt_x86_sse_level >= 10 elif uopt_x86_sse_level >= 10
args_msvc_sse += '/arch:SSE' args_msvc += [ '/arch:SSE' ]
endif endif
project_c_args += args_msvc_sse
project_cpp_args += args_msvc_sse
endif endif
args_msvc = [ '/GS', '-D_SCL_SECURE_NO_WARNINGS' ] if get_option('debug')
project_c_args += args_msvc project_link_args += [
project_cpp_args += args_msvc '/NODEFAULTLIB:MSVCRT',
]
else
args_msvc += [
'/Oy-',
'/fp:fast',
]
project_link_args += [ project_link_args += [
'/OPT:REF', '/OPT:REF',
'/OPT:ICF', '/OPT:ICF',
] ]
if not get_option('debug')
args_msvc_opt = [ '/Oy-', '/fp:fast' ]
project_c_args += args_msvc_opt
project_cpp_args += args_msvc_opt
endif endif
project_c_args += args_msvc
project_cpp_args += args_msvc
else else
args_ccomp = [ '-U__STRICT_ANSI__', '-Wno-unused-result' ]
if copt_platform == 'mac' if copt_platform == 'mac'
if uopt_x86_sse_level >= 0 if uopt_x86_sse_level >= 0
message('SSE level explicitly configured but unavailable on macosx') message('SSE level explicitly configured but unavailable on macosx')
@ -147,36 +152,37 @@ else
uopt_native = false uopt_native = false
endif endif
else else
args_ccomp_sse = []
if uopt_x86_sse_level >= 30 if uopt_x86_sse_level >= 30
args_ccomp_sse += '-msse3' args_ccomp += [ '-msse3' ]
endif endif
if uopt_x86_sse_level >= 20 if uopt_x86_sse_level >= 20
args_ccomp_sse += '-msse2' args_ccomp += [ '-msse2' ]
endif endif
if uopt_x86_sse_level >= 10 if uopt_x86_sse_level >= 10
args_ccomp_sse += '-msse' args_ccomp += [ '-msse' ]
endif endif
if uopt_native if uopt_native
args_ccomp_sse += '-march=native' args_ccomp += [ '-march=native' ]
endif endif
project_c_args += args_ccomp_sse
project_cpp_args += args_ccomp_sse
endif endif
project_c_args += [ '-U__STRICT_ANSI__', '-Wno-unused-result' ]
project_cpp_args += [ '-U__STRICT_ANSI__', '-Wno-unused-result', '-Wno-invalid-offsetof' ]
if not get_option('debug') if not get_option('debug')
args_ccomp = [ '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer' ] args_ccomp += [
project_c_args += args_ccomp '-ftree-vectorize',
project_cpp_args += args_ccomp '-funsafe-math-optimizations',
'-ffast-math',
'-fomit-frame-pointer',
]
endif endif
project_c_args += args_ccomp
project_cpp_args += args_ccomp + [ '-Wno-invalid-offsetof' ]
endif endif
if copt_platform == 'win' if copt_platform == 'win'
other_dep = tpt_libs.get_variable('other_dep') other_dep = tpt_libs.get_variable('other_dep')
sdl2main_dep = tpt_libs.get_variable('sdl2main_dep') sdl2main_dep = tpt_libs.get_variable('sdl2main_dep')
project_c_args += [ '-D_WIN32_WINNT=0x0501' ] args_ccomp_win = [ '-D_WIN32_WINNT=0x0501' ]
project_cpp_args += [ '-D_WIN32_WINNT=0x0501' ] project_c_args += args_ccomp_win
project_cpp_args += args_ccomp_win
windows_mod = import('windows') windows_mod = import('windows')
if uopt_static != 'none' if uopt_static != 'none'
conf_data.set('CURL_STATICLIB', true) conf_data.set('CURL_STATICLIB', true)
@ -189,7 +195,10 @@ if copt_platform == 'win'
endif endif
if copt_platform == 'mac' and uopt_lua == 'luajit' if copt_platform == 'mac' and uopt_lua == 'luajit'
project_link_args += [ '-pagezero_size', '10000', '-image_base', '100000000' ] project_link_args += [
'-pagezero_size', '10000',
'-image_base', '100000000',
]
endif endif
project_inc = include_directories([ 'src', 'data', 'resources' ]) project_inc = include_directories([ 'src', 'data', 'resources' ])