- fixed compilation with the new juce_dsp module

christophhart · Apr 21, 2018 · d60e7a9 · d60e7a9
1 parent f6b5749
commit d60e7a9
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 11 deletions.
diff --git a/extras/demo_project/project_info.xml b/extras/demo_project/project_info.xml
@@ -15,4 +15,6 @@
   <ExtraDefinitionsWindows value="" type="TEXT" description="Extra preprocessor definitions for Windows"/>
   <ExtraDefinitionsOSX value="" type="TEXT" description="Extra preprocessor definitions for OSX"/>
   <ExtraDefinitionsIOS value="" type="TEXT" description="Extra preprocessor definitions for IOS"/>
+  <AppGroupID value=""/>
+  <RedirectSampleFolder value=""/>
 </ProjectSettings>
diff --git a/extras/demo_project/user_info.xml b/extras/demo_project/user_info.xml
@@ -5,4 +5,5 @@
   <CompanyCode value="Hain" type="TEXT" description="Company Code (4 characters, first must be uppercase)"/>
   <CompanyURL value="http://hise.audio" type="TEXT" description="Company Website"/>
   <CompanyCopyright value="&#169;2017, Company" type="TEXT" description="Company Copyright"/>
+  <TeamDevelopmentID value=""/>
 </UserSettings>
diff --git a/hi_backend/backend/CompileExporter.cpp b/hi_backend/backend/CompileExporter.cpp
@@ -1457,9 +1457,11 @@ hise::CompileExporter::CompileExporter::ErrorCodes CompileExporter::createStanda
 {
 	String templateProject = String(projectStandaloneTemplate_jucer);
 
-	REPLACE_WILDCARD("%NAME%", GET_SETTING(HiseSettings::Project::Name));
-	REPLACE_WILDCARD("%VERSION%", GET_SETTING(HiseSettings::Project::Version));
-	REPLACE_WILDCARD("%BUNDLE_ID%", GET_SETTING(HiseSettings::Project::BundleIdentifier));
+	auto name = GET_SETTING(HiseSettings::Project::Name);
+
+	REPLACE_WILDCARD("%NAME%", HiseSettings::Project::Name);
+	REPLACE_WILDCARD("%VERSION%", HiseSettings::Project::Version);
+	REPLACE_WILDCARD("%BUNDLE_ID%", HiseSettings::Project::BundleIdentifier);
 
 	const File asioPath = hisePath.getChildFile("tools/SDK/ASIOSDK2.3/common");
 

diff --git a/hi_backend/backend/ProjectTemplate.cpp b/hi_backend/backend/ProjectTemplate.cpp
@@ -48,7 +48,7 @@ static const unsigned char projectTemplate_jucer_lines[] =
 "              pluginAAXCategory=\"%AAX_CATEGORY%\" jucerVersion=\"5.2.0\"\r\n"
 "              companyName=\"%COMPANY%\" companyWebsite=\"%COMPANY_WEBSITE%\" companyCopyright=\"%COMPANY_COPYRIGHT%\""
 "   displaySplashScreen=\"0\""
-"     reportAppUsage=\"0\" splashScreenColour=\"Dark\" enableIAA=\"1\" cppLanguageStandard=\"11\">\r\n"
+"     reportAppUsage=\"0\" splashScreenColour=\"Dark\" enableIAA=\"1\" cppLanguageStandard=\"14\">\r\n"
 "  <MAINGROUP id=\"SLR7uY\" name=\"%NAME%\">\r\n"
 "    <GROUP id=\"{122C85F1-8B09-257A-B636-113E3EAC258A}\" name=\"Source\">\r\n"
 "      <FILE id=\"eLP6Ii\" name=\"balanceKnob_200.png\" compile=\"0\" resource=\"1\"\r\n"
@@ -96,6 +96,7 @@ static const unsigned char projectTemplate_jucer_lines[] =
 "        <MODULEPATH id=\"juce_events\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_graphics\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_data_structures\" path=\"%JUCE_PATH%\"/>\r\n"
+"        <MODULEPATH id=\"juce_dsp\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_gui_basics\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_gui_extra\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_cryptography\" path=\"%JUCE_PATH%\"/>\r\n"
@@ -139,6 +140,7 @@ static const unsigned char projectTemplate_jucer_lines[] =
 "        <MODULEPATH id=\"juce_graphics\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_events\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_data_structures\" path=\"%JUCE_PATH%\"/>\r\n"
+"        <MODULEPATH id=\"juce_dsp\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_cryptography\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_core\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_audio_utils\" path=\"%JUCE_PATH%\"/>\r\n"
@@ -180,6 +182,7 @@ static const unsigned char projectTemplate_jucer_lines[] =
 "        <MODULEPATH id=\"juce_graphics\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_events\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_data_structures\" path=\"%JUCE_PATH%\"/>\r\n"
+"        <MODULEPATH id=\"juce_dsp\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_cryptography\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_core\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_audio_utils\" path=\"%JUCE_PATH%\"/>\r\n"
@@ -214,6 +217,7 @@ static const unsigned char projectTemplate_jucer_lines[] =
 "        <MODULEPATH id=\"juce_graphics\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_events\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_data_structures\" path=\"%JUCE_PATH%\"/>\r\n"
+"        <MODULEPATH id=\"juce_dsp\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_cryptography\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_core\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_audio_utils\" path=\"%JUCE_PATH%\"/>\r\n"
@@ -248,6 +252,7 @@ static const unsigned char projectTemplate_jucer_lines[] =
 "    <MODULE id=\"hi_streaming\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
 "    <MODULE id=\"juce_audio_basics\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
 "    <MODULE id=\"juce_audio_devices\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
+"    <MODULE id=\"juce_dsp\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
 "    <MODULE id=\"juce_audio_formats\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
 "    <MODULE id=\"juce_audio_plugin_client\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
 "    <MODULE id=\"juce_audio_processors\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
@@ -264,7 +269,8 @@ static const unsigned char projectTemplate_jucer_lines[] =
 "  </MODULES>\r\n"
 "  <JUCEOPTIONS JUCE_QUICKTIME=\"disabled\" USE_BACKEND=\"disabled\" USE_FRONTEND=\"enabled\" HI_EXPORT_DSP_LIBRARY=\"disabled\" USE_COPY_PROTECTION=\"%USE_COPY_PROTECTION%\" IS_STANDALONE_APP=\"disabled\"\r\n"
 "               USE_IPP=\"%USE_IPP%\" FRONTEND_IS_PLUGIN=\"%FRONTEND_IS_PLUGIN%\" USE_CUSTOM_FRONTEND_TOOLBAR=\"%USE_CUSTOM_FRONTEND_TOOLBAR%\" IS_STANDALONE_FRONTEND=\"%IS_STANDALONE_FRONTEND%\" USE_GLITCH_DETECTION = \"enabled\" ENABLE_PLOTTER=\"disabled\" ENABLE_SCRIPTING_SAFE_CHECKS=\"disabled\""
-"               ENABLE_ALL_PEAK_METERS=\"disabled\" USE_SPLASH_SCREEN=\"%USE_SPLASH_SCREEN%\" ENABLE_CONSOLE_OUTPUT=\"disabled\" HLAC_MEASURE_DECODING_PERFORMANCE=\"disabled\" HLAC_DEBUG_LOG=\"disabled\" HLAC_INCLUDE_TEST_SUITE=\"disabled\" STANDALONE_STREAMING=\"disabled\"/>/>\r\n"
+"               ENABLE_ALL_PEAK_METERS=\"disabled\" USE_SPLASH_SCREEN=\"%USE_SPLASH_SCREEN%\" ENABLE_CONSOLE_OUTPUT=\"disabled\" HLAC_MEASURE_DECODING_PERFORMANCE=\"disabled\" HLAC_DEBUG_LOG=\"disabled\" HLAC_INCLUDE_TEST_SUITE=\"disabled\" STANDALONE_STREAMING=\"disabled\""
+"				JUCE_ASSERTION_FIRFILTER=\"disabled\" JUCE_DSP_USE_INTEL_MKL=\"disabled\" JUCE_DSP_USE_SHARED_FFTW=\"disabled\" JUCE_DSP_USE_STATIC_FFTW=\"disabled\"/>/>\r\n"
 "</JUCERPROJECT>\r\n";
 
 const char* projectTemplate_jucer = (const char*)projectTemplate_jucer_lines;

diff --git a/hi_backend/backend/StandaloneProjectTemplate.cpp b/hi_backend/backend/StandaloneProjectTemplate.cpp
@@ -30,16 +30,17 @@
  *   ===========================================================================
  */
 
- namespace hise { using namespace juce;
-
+namespace hise {
+using namespace juce;
+
 // This is a autogenerated file that contains the template for the plugin exporter .jucer file
 
 static const unsigned char projectStandaloneTemplate_jucer_lines[] =
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
 "\r\n"
 "<JUCERPROJECT id=\"Tw64Zd\" name=\"%NAME%\" projectType=\"guiapp\" version=\"%VERSION%\"\r\n"
 "              bundleIdentifier=\"%BUNDLE_ID%\" includeBinaryInAppConfig=\"1\"\r\n"
-"              jucerVersion=\"5.2.0\" companyName=\"%COMPANY%\" companyWebsite=\"%COMPANY_WEBSITE%\" companyCopyright=\"%COMPANY_COPYRIGHT%\" displaySplashScreen=\"0\" reportAppUsage=\"0\">\r\n"
+"              jucerVersion=\"5.2.0\" companyName=\"%COMPANY%\" companyWebsite=\"%COMPANY_WEBSITE%\" companyCopyright=\"%COMPANY_COPYRIGHT%\" displaySplashScreen=\"0\" reportAppUsage=\"0\" cppLanguageStandard=\"14\">\r\n"
 "  <MAINGROUP id=\"SLR7uY\" name=\"%NAME%\">\r\n"
 "    <GROUP id=\"{122C85F1-8B09-257A-B636-113E3EAC258A}\" name=\"Source\">\r\n"
 "      <FILE id=\"eLP6Ii\" name=\"balanceKnob_200.png\" compile=\"0\" resource=\"1\"\r\n"
@@ -88,6 +89,7 @@ static const unsigned char projectStandaloneTemplate_jucer_lines[] =
 "        <MODULEPATH id=\"juce_events\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_graphics\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_data_structures\" path=\"%JUCE_PATH%\"/>\r\n"
+"        <MODULEPATH id=\"juce_dsp\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_gui_basics\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_gui_extra\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_cryptography\" path=\"%JUCE_PATH%\"/>\r\n"
@@ -130,6 +132,7 @@ static const unsigned char projectStandaloneTemplate_jucer_lines[] =
 "        <MODULEPATH id=\"juce_graphics\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_events\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_data_structures\" path=\"%JUCE_PATH%\"/>\r\n"
+"        <MODULEPATH id=\"juce_dsp\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_cryptography\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_core\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_audio_utils\" path=\"%JUCE_PATH%\"/>\r\n"
@@ -162,6 +165,7 @@ static const unsigned char projectStandaloneTemplate_jucer_lines[] =
 "        <MODULEPATH id=\"juce_graphics\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_events\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_data_structures\" path=\"%JUCE_PATH%\"/>\r\n"
+"        <MODULEPATH id=\"juce_dsp\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_cryptography\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_core\" path=\"%JUCE_PATH%\"/>\r\n"
 "        <MODULEPATH id=\"juce_audio_utils\" path=\"%JUCE_PATH%\"/>\r\n"
@@ -201,6 +205,7 @@ static const unsigned char projectStandaloneTemplate_jucer_lines[] =
 "    <MODULE id=\"juce_core\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
 "    <MODULE id=\"juce_cryptography\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
 "    <MODULE id=\"juce_data_structures\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
+"    <MODULE id=\"juce_dsp\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
 "    <MODULE id=\"juce_events\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
 "    <MODULE id=\"juce_graphics\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
 "    <MODULE id=\"juce_gui_basics\" showAllCode=\"1\" useLocalCopy=\"0\"/>\r\n"
@@ -214,7 +219,8 @@ static const unsigned char projectStandaloneTemplate_jucer_lines[] =
 "               USE_CUSTOM_FRONTEND_TOOLBAR=\"%USE_CUSTOM_FRONTEND_TOOLBAR%\" IS_STANDALONE_FRONTEND=\"%IS_STANDALONE_FRONTEND%\" USE_GLITCH_DETECTION=\"enabled\"\r\n"
 "               ENABLE_PLOTTER=\"disabled\" ENABLE_SCRIPTING_SAFE_CHECKS=\"disabled\"\r\n"
 "               ENABLE_ALL_PEAK_METERS=\"disabled\" ENABLE_CONSOLE_OUTPUT=\"disabled\"\r\n"
-"               JUCE_ASIO=\"%USE_ASIO%\" USE_SPLASH_SCREEN=\"%USE_SPLASH_SCREEN%\" HLAC_MEASURE_DECODING_PERFORMANCE=\"disabled\" HLAC_DEBUG_LOG=\"disabled\" HLAC_INCLUDE_TEST_SUITE=\"disabled\" STANDALONE_STREAMING=\"disabled\"/>\r\n"
+"               JUCE_ASIO=\"%USE_ASIO%\" USE_SPLASH_SCREEN=\"%USE_SPLASH_SCREEN%\" HLAC_MEASURE_DECODING_PERFORMANCE=\"disabled\" HLAC_DEBUG_LOG=\"disabled\" HLAC_INCLUDE_TEST_SUITE=\"disabled\" STANDALONE_STREAMING=\"disabled\""
+"				JUCE_DSP_USE_INTEL_MKL=\"disabled\" JUCE_DSP_USE_SHARED_FFTW=\"disabled\" JUCE_DSP_USE_STATIC_FFTW=\"disabled\"/>\r\n"
 "</JUCERPROJECT>\r\n";
 
 const char* projectStandaloneTemplate_jucer = (const char*)projectStandaloneTemplate_jucer_lines;

diff --git a/projects/plugin/HISE.jucer b/projects/plugin/HISE.jucer
@@ -12,7 +12,7 @@
               companyName="Hart Instruments" companyWebsite="http://hise.audio"
               pluginIsMidiEffectPlugin="0" buildAUv3="0" companyCopyright="Hart Instruments"
               displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"
-              buildStandalone="0" enableIAA="0" cppLanguageStandard="11">
+              buildStandalone="0" enableIAA="0" cppLanguageStandard="14">
   <MAINGROUP id="VUOG93" name="HISE">
     <GROUP id="{665762C7-5461-7343-9D6B-1FFA3A6308C3}" name="Source">
       <FILE id="PpFbAI" name="balanceKnob_200.png" compile="0" resource="1"
@@ -103,6 +103,7 @@
         <MODULEPATH id="hi_dsp" path="../../"/>
         <MODULEPATH id="hi_streaming" path="../../../HISE modules"/>
         <MODULEPATH id="juce_product_unlocking" path="../../JUCE/modules"/>
+        <MODULEPATH id="juce_dsp" path="../../JUCE/modules"/>
       </MODULEPATHS>
     </XCODE_MAC>
     <VS2015 targetFolder="Builds/VisualStudio2015" vstFolder="c:\SDKs\vstsdk2.4"
@@ -171,6 +172,7 @@
         <MODULEPATH id="hi_dsp" path="../../"/>
         <MODULEPATH id="hi_streaming" path="../../../HISE modules"/>
         <MODULEPATH id="juce_product_unlocking" path="../../JUCE/modules"/>
+        <MODULEPATH id="juce_dsp" path="../../JUCE/modules"/>
       </MODULEPATHS>
     </VS2015>
     <VS2017 targetFolder="Builds/VisualStudio2017" vstFolder="c:\SDKs\vstsdk2.4"
@@ -242,6 +244,7 @@
         <MODULEPATH id="hi_dsp" path="../../"/>
         <MODULEPATH id="hi_streaming" path="../../../HISE modules"/>
         <MODULEPATH id="juce_product_unlocking" path="../../JUCE/modules"/>
+        <MODULEPATH id="juce_dsp" path="../../JUCE/modules"/>
       </MODULEPATHS>
     </VS2017>
     <LINUX_MAKE targetFolder="Builds/LinuxMakefile" extraDefs="">
@@ -277,6 +280,7 @@
         <MODULEPATH id="hi_dsp" path="../../"/>
         <MODULEPATH id="hi_streaming" path="../../../HISE modules"/>
         <MODULEPATH id="juce_product_unlocking" path="../../JUCE/modules"/>
+        <MODULEPATH id="juce_dsp" path="../../JUCE/modules"/>
       </MODULEPATHS>
     </LINUX_MAKE>
   </EXPORTFORMATS>
@@ -300,6 +304,7 @@
     <MODULES id="juce_core" showAllCode="1" useLocalCopy="0"/>
     <MODULES id="juce_cryptography" showAllCode="1" useLocalCopy="0"/>
     <MODULES id="juce_data_structures" showAllCode="1" useLocalCopy="0"/>
+    <MODULE id="juce_dsp" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
     <MODULES id="juce_events" showAllCode="1" useLocalCopy="0"/>
     <MODULES id="juce_graphics" showAllCode="1" useLocalCopy="0"/>
     <MODULES id="juce_gui_basics" showAllCode="1" useLocalCopy="0"/>
@@ -317,7 +322,9 @@
                USE_HARD_CLIPPER="enabled" USE_IPP="enabled" USE_VDSP_FFT="disabled"
                ENABLE_SCRIPTING_BREAKPOINTS="enabled" HLAC_MEASURE_DECODING_PERFORMANCE="disabled"
                HLAC_DEBUG_LOG="disabled" HLAC_INCLUDE_TEST_SUITE="disabled"
-               STANDALONE_STREAMING="disabled"/>
+               STANDALONE_STREAMING="disabled" JUCE_ASSERTION_FIRFILTER="disabled"
+               JUCE_DSP_USE_INTEL_MKL="disabled" JUCE_DSP_USE_SHARED_FFTW="disabled"
+               JUCE_DSP_USE_STATIC_FFTW="disabled"/>
   <LIVE_SETTINGS>
     <OSX/>
   </LIVE_SETTINGS>

diff --git a/projects/plugin/JuceLibraryCode/AppConfig.h b/projects/plugin/JuceLibraryCode/AppConfig.h
@@ -67,6 +67,7 @@
 #define JUCE_MODULE_AVAILABLE_juce_core                     1
 #define JUCE_MODULE_AVAILABLE_juce_cryptography             1
 #define JUCE_MODULE_AVAILABLE_juce_data_structures          1
+#define JUCE_MODULE_AVAILABLE_juce_dsp                      1
 #define JUCE_MODULE_AVAILABLE_juce_events                   1
 #define JUCE_MODULE_AVAILABLE_juce_graphics                 1
 #define JUCE_MODULE_AVAILABLE_juce_gui_basics               1
@@ -330,6 +331,29 @@
  //#define JUCE_ALLOW_STATIC_NULL_VARIABLES 1
 #endif
 
+//==============================================================================
+// juce_dsp flags:
+
+#ifndef    JUCE_ASSERTION_FIRFILTER
+ #define   JUCE_ASSERTION_FIRFILTER 0
+#endif
+
+#ifndef    JUCE_DSP_USE_INTEL_MKL
+ #define   JUCE_DSP_USE_INTEL_MKL 0
+#endif
+
+#ifndef    JUCE_DSP_USE_SHARED_FFTW
+ #define   JUCE_DSP_USE_SHARED_FFTW 0
+#endif
+
+#ifndef    JUCE_DSP_USE_STATIC_FFTW
+ #define   JUCE_DSP_USE_STATIC_FFTW 0
+#endif
+
+#ifndef    JUCE_DSP_ENABLE_SNAP_TO_ZERO
+ //#define JUCE_DSP_ENABLE_SNAP_TO_ZERO 1
+#endif
+
 //==============================================================================
 // juce_events flags: