mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 19:29:52 +02:00
Code Issues Projects Releases Wiki Activity

Migrate hardcoded -D flags to per-target Config.h

Browse Source
This commit is contained in:
Tamás Bálint Misius
2021-01-18 12:20:36 +01:00
parent 36f661b87f
commit ea41fa4e81
7 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
meson.build
View File

@@ -247,16 +247,6 @@ subdir('data')
subdir('resources')
if get_option('build_powder')
powder_args = []
if uopt_lua != 'none'
powder_args += '-DLUACONSOLE'
endif
if not uopt_http
powder_args += '-DNOHTTP'
endif
if uopt_fftw
powder_args += '-DGRAVFFT'
endif
powder_deps = [
threads_dep,
zlib_dep,
@@ -272,9 +262,9 @@ if get_option('build_powder')
executable(
'powder',
sources: powder_files,
include_directories: project_inc,
c_args: project_c_args + powder_args,
cpp_args: project_cpp_args + powder_args,
include_directories: [ project_inc, powder_inc ],
c_args: project_c_args,
cpp_args: project_cpp_args,
cpp_pch: 'pch/pch_cpp.h',
gui_app: true,
link_args: project_link_args,
@@ -283,7 +273,6 @@ if get_option('build_powder')
endif
if get_option('build_render')
render_args = [ '-DRENDERER', '-DNOHTTP' ]
render_deps = [
threads_dep,
zlib_dep,
@@ -291,9 +280,9 @@ if get_option('build_render')
executable(
'render',
sources: render_files,
include_directories: project_inc,
c_args: project_c_args + render_args,
cpp_args: project_cpp_args + render_args,
include_directories: [ project_inc, render_inc ],
c_args: project_c_args,
cpp_args: project_cpp_args,
cpp_pch: 'pch/pch_cpp.h',
link_args: project_link_args,
dependencies: render_deps,
@@ -301,7 +290,6 @@ if get_option('build_render')
endif
if get_option('build_font')
font_args = [ '-DFONTEDITOR', '-DNOHTTP' ]
font_deps = [
threads_dep,
zlib_dep,
@@ -314,9 +302,9 @@ if get_option('build_font')
executable(
'font',
sources: font_files,
include_directories: project_inc,
c_args: project_c_args + font_args,
cpp_args: project_cpp_args + font_args,
include_directories: [ project_inc, font_inc ],
c_args: project_c_args,
cpp_args: project_cpp_args,
cpp_pch: 'pch/pch_cpp.h',
gui_app: true,
link_args: project_link_args,