Adapt all scripts to work together with build-packages.sh

This commit is contained in:
redtide
2021-09-07 15:03:00 +02:00
committed by Francesco Abbate
parent 91da2ddfdd
commit 261ab5daf2
17 changed files with 829 additions and 601 deletions
+25 -21
View File
@@ -42,26 +42,28 @@ endif
#===============================================================================
# Dependencies
#===============================================================================
libm = cc.find_library('m', required : false)
libdl = cc.find_library('dl', required : false)
lua_dep = dependency('lua5.2', fallback: ['lua', 'lua_dep'],
default_options: ['shared=false', 'use_readline=false', 'app=false']
)
pcre2_dep = dependency('libpcre2-8')
sdl_dep = dependency('sdl2', method: 'config-tool')
reproc_dep = dependency('reproc', fallback: ['reproc', 'reproc_dep'],
default_options: [
'default_library=static', 'multithreaded=false',
'reproc-cpp=false', 'examples=false'
]
)
if not get_option('source-only')
libm = cc.find_library('m', required : false)
libdl = cc.find_library('dl', required : false)
lua_dep = dependency('lua5.2', fallback: ['lua', 'lua_dep'],
default_options: ['shared=false', 'use_readline=false', 'app=false']
)
pcre2_dep = dependency('libpcre2-8')
sdl_dep = dependency('sdl2', method: 'config-tool')
reproc_dep = dependency('reproc', fallback: ['reproc', 'reproc_dep'],
default_options: [
'default_library=static', 'multithreaded=false',
'reproc-cpp=false', 'examples=false'
]
)
lite_deps = [lua_dep, sdl_dep, reproc_dep, pcre2_dep, libm, libdl]
lite_deps = [lua_dep, sdl_dep, reproc_dep, pcre2_dep, libm, libdl]
if host_machine.system() == 'windows'
# Note that we need to explicitly add the windows socket DLL because
# the pkg-config file from reproc does not include it.
lite_deps += meson.get_compiler('cpp').find_library('ws2_32', required: true)
if host_machine.system() == 'windows'
# Note that we need to explicitly add the windows socket DLL because
# the pkg-config file from reproc does not include it.
lite_deps += meson.get_compiler('cpp').find_library('ws2_32', required: true)
endif
endif
#===============================================================================
# Install Configuration
@@ -118,6 +120,8 @@ configure_file(
#===============================================================================
# Targets
#===============================================================================
subdir('lib/font_renderer')
subdir('src')
subdir('scripts')
if not get_option('source-only')
subdir('lib/font_renderer')
subdir('src')
subdir('scripts')
endif