From 01a49812108f2f7fe901db46665f134c98970e1f Mon Sep 17 00:00:00 2001 From: Francesco Abbate Date: Tue, 2 Jun 2020 23:20:22 +0200 Subject: [PATCH] Use static libgcc and libstdc++ when doing release build --- meson.build | 6 ++++++ src/meson.build | 5 +++-- tests/meson.build | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 9089f3e5..0267f9da 100644 --- a/meson.build +++ b/meson.build @@ -13,5 +13,11 @@ stb_truetype_dep = dependency('stb_truetype') lite_include = include_directories('src') install_subdir('data', install_dir : 'bin') +lite_cdefs = [] +lite_link_args = [] +if get_option('buildtype') == 'release' + lite_link_args += ['-static-libgcc', '-static-libstdc++'] +endif + subdir('src') subdir('tests') diff --git a/src/meson.build b/src/meson.build index 55462c7f..766219f0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -10,13 +10,14 @@ lite_sources = [ 'main.c', ] -renderer_cdefs = ['-DFONT_RENDERER_HEIGHT_HACK'] +lite_cdefs += ['-DFONT_RENDERER_HEIGHT_HACK'] executable('lite', lite_sources, include_directories: lite_include, dependencies: [lua_dep, sdl_dep, libagg_dep, freetype_dep, libm, libdl], - cpp_args: renderer_cdefs, + link_args: lite_link_args, + cpp_args: lite_cdefs, install: true, gui_app: true, ) diff --git a/tests/meson.build b/tests/meson.build index f7159567..8d8e3306 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -8,7 +8,7 @@ executable('stb-font-render-test', executable('agg-font-render-test', ['../src/agg_font_freetype.cpp', '../src/font_renderer.cpp', 'agg_font_render_test.c'], include_directories: lite_include, - cpp_args: renderer_cdefs, + cpp_args: lite_cdefs, dependencies: [sdl_dep, libagg_dep, freetype_dep, libm, libdl], install: false, )