Windows: Fix JPTIZ comments
Remove debugging `asserts` and unnecessary parenthesis ta `if`.
This commit is contained in:
parent
f7d1061a35
commit
65278b6438
14
meson.build
14
meson.build
|
@ -395,14 +395,11 @@ subprojects = [
|
|||
['efl' ,[] , false, true, false, false, true, false, ['eo'], []],
|
||||
['emile' ,[] , false, true, false, false, true, true, ['eina', 'efl'], ['lz4', 'rg_etc']],
|
||||
['eet' ,[] , false, true, true, false, true, true, ['eina', 'emile', 'efl'], []],
|
||||
['ecore' ,[] , false, true, false, false, false,
|
||||
false, ['eina', 'eo', 'efl'], ['buildsystem']]]
|
||||
['ecore' ,[] , false, true, false, false, false, false, ['eina', 'eo', 'efl'], ['buildsystem']]]
|
||||
|
||||
if not sys_windows
|
||||
subprojects += [['eldbus' ,[] , false, true,
|
||||
true, false, true, true, ['eina', 'eo', 'efl'], []]]
|
||||
assert(subprojects[-1] == ['eldbus' ,[] , false,
|
||||
true, true, false, true, true, ['eina', 'eo', 'efl'], []])
|
||||
endif
|
||||
|
||||
subprojects += [
|
||||
|
@ -426,8 +423,6 @@ subprojects += [
|
|||
if not sys_windows
|
||||
subprojects += [['elput' ,['drm'] , false, true,
|
||||
false, false, true, false, ['eina', 'eldbus'], []]]
|
||||
assert(subprojects[-1] == ['elput' ,['drm'] , false,
|
||||
true, false, false, true, false, ['eina', 'eldbus'], []])
|
||||
endif
|
||||
|
||||
subprojects += [
|
||||
|
@ -454,13 +449,9 @@ subprojects += [
|
|||
if not sys_windows
|
||||
subprojects += [['elua' ,['elua'] , false, true,
|
||||
true, false, true, false, ['eina', 'luajit'], []]]
|
||||
assert(subprojects[-1] == ['elua' ,['elua'] , false,
|
||||
true, true, false, true, false, ['eina', 'luajit'], []])
|
||||
else
|
||||
subprojects += [['elua' ,['elua'] , false, true,
|
||||
true, false, true, false, ['eina', 'lua'], []]]
|
||||
assert(subprojects[-1] == ['elua' ,['elua'] , false,
|
||||
true, true, false, true, false, ['eina', 'lua'], []])
|
||||
endif
|
||||
|
||||
subprojects += [
|
||||
|
@ -469,9 +460,6 @@ subprojects += [
|
|||
['exactness' ,[] , false, false, true, false, false, false, ['eina, evas, eet'], []],
|
||||
]
|
||||
|
||||
assert(subprojects[-1] == ['exactness' ,[] , false,
|
||||
false, true, false, false, false, ['eina, evas, eet'], []])
|
||||
|
||||
# We generate Efl_Config.h and config.h later, they will be available here
|
||||
config_dir += include_directories('.')
|
||||
|
||||
|
|
|
@ -11,9 +11,8 @@ cxx_sublibs = [
|
|||
['Evas', false, true, true, []],
|
||||
['Edje', false, false, true, []],]
|
||||
|
||||
if (not sys_windows)
|
||||
if not sys_windows
|
||||
cxx_sublibs += [['Eldbus', true, true, true, []]]
|
||||
assert(cxx_sublibs[-1] == ['Eldbus', true, true, true, []])
|
||||
endif
|
||||
|
||||
cxx_sublibs += [
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
bindings = get_option('bindings')
|
||||
if (not sys_windows)
|
||||
if not sys_windows
|
||||
bindings_order = ['luajit', 'cxx', 'mono']
|
||||
else
|
||||
bindings_order = ['lua', 'cxx', 'mono']
|
||||
|
|
|
@ -11,14 +11,10 @@ subdir('common')
|
|||
|
||||
inc_dir = config_dir
|
||||
common_deps = generic_deps
|
||||
if (sys_windows)
|
||||
if sys_windows
|
||||
inc_dir = [inc_dir, zlib_include_dir]
|
||||
assert(inc_dir[0] == config_dir)
|
||||
assert(inc_dir[1] == zlib_include_dir)
|
||||
else
|
||||
common_deps = [generic_deps, rt]
|
||||
assert(common_deps[0] == generic_deps)
|
||||
assert(common_deps[1] == rt)
|
||||
endif
|
||||
|
||||
common = static_library('evas_loader_common',
|
||||
|
|
|
@ -4,7 +4,7 @@ generic_src = files([
|
|||
'pixelfuncs.c'
|
||||
])
|
||||
|
||||
if (not sys_windows)
|
||||
if not sys_windows
|
||||
generic_deps = [eina, dependency('zlib')]
|
||||
else
|
||||
generic_deps = [eina, zlib]
|
||||
|
|
|
@ -196,7 +196,7 @@ if get_option('systemd') == true
|
|||
ecore_deps += systemd
|
||||
endif
|
||||
|
||||
if (not sys_windows)
|
||||
if not sys_windows
|
||||
ecore_lib_deps = [m, buildsystem, ecore_deps]
|
||||
else
|
||||
ecore_lib_deps = [buildsystem, ecore_deps]
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
eet_deps = [crypto, jpeg, rg_etc]
|
||||
if not sys_windows
|
||||
eet_deps += m
|
||||
assert(eet_deps[-1] == m)
|
||||
endif
|
||||
|
||||
eet_pub_deps = [eina, emile, efl]
|
||||
|
|
|
@ -21,7 +21,7 @@ endif
|
|||
webp = dependency('libwebp', required: get_option('evas-loaders-disabler').contains('webp') == false)
|
||||
libopenjp2 = dependency('libopenjp2', required: get_option('evas-loaders-disabler').contains('jp2k') == false)
|
||||
|
||||
if (sys_windows and get_option('evas-loaders-disabler').contains('generic'))
|
||||
if sys_windows and get_option('evas-loaders-disabler').contains('generic')
|
||||
rt = declare_dependency()
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue