Fix issue #142 Compiling from master fails since implementing NAM

brummer10 · Feb 24, 2024 · 5064883 · 5064883
1 parent acfb4eb
commit 5064883
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/trunk/src/NAM/wscript b/trunk/src/NAM/wscript
@@ -29,16 +29,17 @@ def build(bld):
         './NeuralAmpModelerCore/Dependencies/nlohmann/',
         ]
 
+    cxx_flags = ["-std=c++17", "-Wno-sign-compare", "-Ofast"]
+
+    if not bld.env['LTO']:
+        cxx_flags.append ("-fno-fat-lto-objects")
+
     bld.stlib(
         name = 'libnam',
         includes = incl,
         export_includes=['..'],
         source = src,
         use = [],
-        cxxflags = ["-std=c++17",
-            "-Wno-sign-compare",
-            "-fno-fat-lto-objects",
-            "-Ofast",
-            ],
+        cxxflags = cxx_flags,
         target = 'nam',
         )
diff --git a/trunk/src/headers/gx_internal_plugins.h b/trunk/src/headers/gx_internal_plugins.h
@@ -680,7 +680,7 @@ class NeuralAmp: public PluginDef {
     double fRec0[2];
     double fRec1[2];
     int need_resample;
-    double loudness;
+    float loudness;
     bool is_inited;
     Glib::ustring load_file;
 

diff --git a/trunk/waftools/cpu_optimization.py b/trunk/waftools/cpu_optimization.py
@@ -169,6 +169,7 @@ def configure(conf):
             cpu_model = append_optimization_flags(conf, cxxflags)
 
     if '-flto' in cxxflags:
+        conf.env['LTO'] = True
         cxxflags.append ("-ffat-lto-objects")
 
     cxxflags.append ("-std=c++17")