From 163db38979575f027bba0730aeb4f44545beb657 Mon Sep 17 00:00:00 2001 From: subhransu mohanty Date: Thu, 18 Jul 2019 10:02:21 +0900 Subject: [PATCH] meson: Fix regression in library size As all the meson variables are in global scope the compiler_flags in stb module reseted all the optimization flag set in the src directory which increased the library size by 100KB. --- src/meson.build | 11 +++++------ src/vector/stb/meson.build | 2 -- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/meson.build b/src/meson.build index 598ac5efa2..d8dd0f32ed 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,17 +1,16 @@ +compiler_flags = ['-DLOT_BUILD'] + cc = meson.get_compiler('cpp') -compiler_flags = [] if (cc.get_id() != 'msvc') - compiler_flags = ['-fno-exceptions', '-fno-rtti', - '-fno-unwind-tables' , '-fno-asynchronous-unwind-tables', - '-Woverloaded-virtual', '-Wno-unused-parameter'] + compiler_flags += ['-fno-exceptions', '-fno-rtti', + '-fno-unwind-tables' , '-fno-asynchronous-unwind-tables', + '-Woverloaded-virtual', '-Wno-unused-parameter'] endif subdir('vector') subdir('lottie') subdir('binding') -compiler_flags += ['-DLOT_BUILD=1'] - rlottie_lib_dep = [ vector_dep, lottie_dep, binding_dep, dependency('threads')] rlottie_lib = shared_library('rlottie', diff --git a/src/vector/stb/meson.build b/src/vector/stb/meson.build index 327b1b14c2..e04bde7471 100644 --- a/src/vector/stb/meson.build +++ b/src/vector/stb/meson.build @@ -1,8 +1,6 @@ source_file = ['stb_image.cpp'] -compiler_flags = ['-DLOT_BUILD=1'] - if get_option('module') == true rlottie_image_loader_lib = shared_library('rlottie-image-loader', source_file,