orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meson - move static libs sraw sse2 inot sse3 build options set 

this fixes builds when sse3 is enabled by building with sse3 opts...
This commit is contained in:
Carsten Haitzler 2018-11-12 16:41:32 +00:00
parent ae2d399dd6
commit e6c7521f5d
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -118,6 +118,7 @@ cpu_neon = false
cpu_neon_intrinsics = false cpu_neon_intrinsics = false
cpu_altivec = false cpu_altivec = false
evas_opt_c_args = [ ] evas_opt_c_args = [ ]
draw_opt_c_args = [ ]
machine_c_args = [ ] machine_c_args = [ ]
compiler = meson.get_compiler('c') compiler = meson.get_compiler('c')
@ -134,6 +135,7 @@ if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
if (get_option('cpu-sse3') == true) if (get_option('cpu-sse3') == true)
config_h.set10('BUILD_SSE3', true) config_h.set10('BUILD_SSE3', true)
evas_opt_c_args += [ '-msse3' ] evas_opt_c_args += [ '-msse3' ]
draw_opt_c_args += [ '-msse3' ]
cpu_sse3 = true cpu_sse3 = true
message('x86 build - SSE3 enabled') message('x86 build - SSE3 enabled')
endif endif

15
src/static_libs/draw/meson.build
View File

@ -1,6 +1,5 @@
draw_src = [ draw_src = [
'draw_main_sse2.c',
'draw_main.c', 'draw_main.c',
'draw_main_neon.c', 'draw_main_neon.c',
'draw_main.c', 'draw_main.c',
@ -8,12 +7,26 @@ draw_src = [
'draw_alpha_main.c' 'draw_alpha_main.c'
] ]
draw_opt_lib = [ ]
if cpu_sse3 == true
draw_opt = static_library('draw_opt',
sources: [ 'draw_main_sse2.c' ],
include_directories: config_dir + [include_directories(join_paths('..', '..', 'lib'))],
c_args: draw_opt_c_args,
dependencies : [eina, efl]
)
draw_opt_lib += [ draw_opt ]
else
draw_src += [ 'draw_main_sse2.c' ]
endif
draw_lib = static_library('draw', draw_lib = static_library('draw',
draw_src, draw_src,
dependencies : [eina, efl], dependencies : [eina, efl],
include_directories : config_dir + [include_directories(join_paths('..', '..', 'lib'))], include_directories : config_dir + [include_directories(join_paths('..', '..', 'lib'))],
install: false, install: false,
link_with: draw_opt_lib,
) )
draw = declare_dependency( draw = declare_dependency(