From 3fd95de33eb16cad1679c142332d9631d8ac850b Mon Sep 17 00:00:00 2001 From: Pascal Gauthier Date: Tue, 29 Dec 2015 20:51:55 -0500 Subject: [PATCH] MSVC fixes --- .gitignore | 3 +- Builds/VisualStudio2012/Dexed.sln | 12 +- Builds/VisualStudio2012/Dexed.v11.suo | Bin 101376 -> 111104 bytes Builds/VisualStudio2012/Dexed.vcxproj | 1133 +++++++++-------- Builds/VisualStudio2012/Dexed.vcxproj.filters | 83 +- Source/DXComponents.h | 1 + Source/Dexed.h | 2 +- Source/EngineMkI.cpp | 10 +- Source/PluginProcessor.h | 2 +- Source/msfa/controllers.h | 31 +- 10 files changed, 668 insertions(+), 609 deletions(-) diff --git a/.gitignore b/.gitignore index 5477358..e8952bf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ Builds/VisualStudio2012/Dexed.vcxproj.user Builds/VisualStudio2012/Dexed.sdf Builds/VisualStudio2012/Debug Builds/VisualStudio2012/Release -Builds/VisualStudio2012/x64 \ No newline at end of file +Builds/VisualStudio2012/x64 +Builds/VisualStudio2012/Dexed.vcxproj.filters \ No newline at end of file diff --git a/Builds/VisualStudio2012/Dexed.sln b/Builds/VisualStudio2012/Dexed.sln index 6b5dd1b..5795149 100644 --- a/Builds/VisualStudio2012/Dexed.sln +++ b/Builds/VisualStudio2012/Dexed.sln @@ -1,17 +1,23 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2012 -Project("{BD26B4C3-163D-4785-A63F-D3E66858BFF3}") = "Dexed", "Dexed.vcxproj", "{1A9EF105-5BF5-9FB6-9634-A91A6D840866}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2012 for Windows Desktop +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dexed", "Dexed.vcxproj", "{1A9EF105-5BF5-9FB6-9634-A91A6D840866}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Debug|Win32.ActiveCfg = Debug|Win32 {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Debug|Win32.Build.0 = Debug|Win32 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Debug|x64.ActiveCfg = Debug|x64 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Debug|x64.Build.0 = Debug|x64 {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Release|Win32.ActiveCfg = Release|Win32 {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Release|Win32.Build.0 = Release|Win32 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Release|x64.ActiveCfg = Release|x64 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Builds/VisualStudio2012/Dexed.v11.suo b/Builds/VisualStudio2012/Dexed.v11.suo index 378fbaecd20c71c6ff2c14ccbf0f210f03cfc27b..4025059ae925b97265a795351ca48322eebadf7c 100644 GIT binary patch delta 5752 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 diff --git a/Builds/VisualStudio2012/Dexed.vcxproj b/Builds/VisualStudio2012/Dexed.vcxproj index 0e7a1e6..6a976ee 100644 --- a/Builds/VisualStudio2012/Dexed.vcxproj +++ b/Builds/VisualStudio2012/Dexed.vcxproj @@ -1,37 +1,54 @@ - - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866} v110 - + DynamicLibrary false v110 + + DynamicLibrary + false + v110 + DynamicLibrary false true v110 - - + + DynamicLibrary + false + true + v110 + + + - + v110 @@ -39,9 +56,13 @@ <_ProjectFileVersion>10.0.30319.1 Dexed + Dexed true + true Dexed + Dexed true + true v110 @@ -50,7 +71,7 @@ true true Win32 - + Disabled @@ -59,7 +80,7 @@ _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) MultiThreadedDebugDLL true - + $(IntDir)\ $(IntDir)\ $(IntDir)\ @@ -87,21 +108,64 @@ $(IntDir)\Dexed.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + + + + + Disabled + ProgramDatabase + ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;C:\work\vstsdk2.4;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + + + $(IntDir)\ + $(IntDir)\ + $(IntDir)\ + Level4 + true + true + + + _DEBUG;%(PreprocessorDefinitions) + + + $(OutDir)\Dexed.dll + true + libcmt.lib; msvcrt.lib;;%(IgnoreSpecificDefaultLibraries) + true + $(IntDir)\Dexed.pdb + Windows + false + true + /FORCE:multiple %(AdditionalOptions) + + + true + $(IntDir)\Dexed.bsc + + NDEBUG;%(PreprocessorDefinitions) true true Win32 - + MinSpace ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;C:\work\vstsdk2.4;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) - MultiThreadedDLL + MultiThreaded true - + $(IntDir)\ $(IntDir)\ $(IntDir)\ @@ -130,32 +194,75 @@ $(IntDir)\Dexed.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + + + + + MinSpace + ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;C:\work\vstsdk2.4;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) + MultiThreaded + true + + + $(IntDir)\ + $(IntDir)\ + $(IntDir)\ + Level4 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)\Dexed.dll + true + %(IgnoreSpecificDefaultLibraries) + false + $(IntDir)\Dexed.pdb + Windows + true + true + true + /FORCE:multiple %(AdditionalOptions) + + + true + $(IntDir)\Dexed.bsc + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + true @@ -1089,20 +1196,20 @@ true - - - - - - - - - - - - - - + + + + + + + + + + + + + + StdCall @@ -1118,472 +1225,472 @@ StdCall - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + \ No newline at end of file diff --git a/Builds/VisualStudio2012/Dexed.vcxproj.filters b/Builds/VisualStudio2012/Dexed.vcxproj.filters index abfc540..7bd2d4d 100644 --- a/Builds/VisualStudio2012/Dexed.vcxproj.filters +++ b/Builds/VisualStudio2012/Dexed.vcxproj.filters @@ -1,5 +1,4 @@ - - + @@ -409,21 +408,6 @@ Juce Modules\juce_audio_basics\synthesisers - - Juce Modules\juce_audio_plugin_client\AU - - - Juce Modules\juce_audio_plugin_client\RTAS - - - Juce Modules\juce_audio_plugin_client\VST - - - Juce Modules\juce_audio_plugin_client\VST3 - - - Juce Modules\juce_audio_plugin_client\AAX - Juce Modules\juce_audio_processors\processors @@ -445,9 +429,6 @@ Juce Modules\juce_audio_processors\format - - Juce Modules\juce_audio_processors\format_types - Juce Modules\juce_audio_processors\format_types @@ -694,21 +675,6 @@ Juce Modules\juce_core\native - - Juce Modules\juce_core\native - - - Juce Modules\juce_core\native - - - Juce Modules\juce_core\native - - - Juce Modules\juce_core\native - - - Juce Modules\juce_core\native - Juce Modules\juce_core\native @@ -784,15 +750,9 @@ Juce Modules\juce_events\native - - Juce Modules\juce_events\native - Juce Modules\juce_events\native - - Juce Modules\juce_events\native - Juce Modules\juce_events\native @@ -892,12 +852,6 @@ Juce Modules\juce_graphics\native - - Juce Modules\juce_graphics\native - - - Juce Modules\juce_graphics\native - Juce Modules\juce_graphics\native @@ -1246,12 +1200,6 @@ Juce Modules\juce_gui_basics\native - - Juce Modules\juce_gui_basics\native - - - Juce Modules\juce_gui_basics\native - Juce Modules\juce_gui_basics\native @@ -1261,21 +1209,6 @@ Juce Modules\juce_gui_basics\native - - Juce Modules\juce_gui_basics\native - - - Juce Modules\juce_gui_basics\native - - - Juce Modules\juce_gui_basics\native - - - Juce Modules\juce_gui_basics\native - - - Juce Modules\juce_gui_basics\native - Juce Modules\juce_gui_basics\native @@ -1333,27 +1266,15 @@ Juce Modules\juce_gui_extra\native - - Juce Modules\juce_gui_extra\native - Juce Modules\juce_gui_extra\native Juce Modules\juce_gui_extra\native - - Juce Modules\juce_gui_extra\native - - - Juce Modules\juce_gui_extra\native - Juce Modules\juce_gui_extra\native - - Juce Modules\juce_gui_extra\native - Juce Modules\juce_gui_extra\native @@ -2804,4 +2725,4 @@ Juce Library Code - + \ No newline at end of file diff --git a/Source/DXComponents.h b/Source/DXComponents.h index 987ac8e..b20c3f5 100644 --- a/Source/DXComponents.h +++ b/Source/DXComponents.h @@ -22,6 +22,7 @@ #define DXCOMPONENTS_H_INCLUDED #include "../JuceLibraryCode/JuceHeader.h" +#include class EnvDisplay : public Component { public: diff --git a/Source/Dexed.h b/Source/Dexed.h index c17bd55..c4aaab1 100644 --- a/Source/Dexed.h +++ b/Source/Dexed.h @@ -31,7 +31,7 @@ void dexed_trace(const char *source, const char *fmt, ...); #define TRACE(fmt, ...) dexed_trace(__PRETTY_FUNCTION__,fmt,##__VA_ARGS__) #endif #else - #define DEXED_VERSION "0.9.1" + #define DEXED_VERSION "0.9.1b1" #define TRACE(fmt, ...) #endif diff --git a/Source/EngineMkI.cpp b/Source/EngineMkI.cpp index 94a849f..351e8d3 100644 --- a/Source/EngineMkI.cpp +++ b/Source/EngineMkI.cpp @@ -22,8 +22,8 @@ */ #include "EngineMkI.h" - -#include +#define _USE_MATH_DEFINES +#include #include #include "msfa/sin.h" @@ -35,6 +35,12 @@ #endif #ifdef _WIN32 + double log2(double n) { + return log(n) / log(2.0); + } + double round(double n) { + return n < 0.0 ? ceil(n - 0.5) : floor(n + 0.5); + } __declspec(align(16)) int zeros[N] = {0}; #else const int32_t __attribute__ ((aligned(16))) zeros[N] = {0}; diff --git a/Source/PluginProcessor.h b/Source/PluginProcessor.h index a032df5..c034f1d 100644 --- a/Source/PluginProcessor.h +++ b/Source/PluginProcessor.h @@ -116,7 +116,7 @@ class DexedAudioProcessor : public AudioProcessor, public AsyncUpdater, public void resolvAppDir(); - int feedback_bitdepth = 0; + int feedback_bitdepth; public : // in MIDI units (0x4000 is neutral) diff --git a/Source/msfa/controllers.h b/Source/msfa/controllers.h index ce6c511..12d04c0 100755 --- a/Source/msfa/controllers.h +++ b/Source/msfa/controllers.h @@ -21,6 +21,10 @@ #include "../Dexed.h" #include +#ifdef _WIN32 +#define snprintf _snprintf +#endif + // State of MIDI controllers const int kControllerPitch = 128; const int kControllerPitchRange = 129; @@ -29,11 +33,18 @@ const int kControllerPitchStep = 130; class FmCore; struct FmMod { - int range = 0; - bool pitch = false; - bool amp = false; - bool eg = false; + int range; + bool pitch; + bool amp; + bool eg; + FmMod() { + range = 0; + pitch = false; + amp = false; + eg = false; + } + void parseConfig(const char *cfg) { int r = 0, p = 0, a = 0, e = 0; sscanf(cfg, "%d %d %d %d", &r, &p, &a, &e); @@ -66,9 +77,9 @@ class Controllers { public: int values_[131]; - int amp_mod = 0; - int pitch_mod = 0; - int eg_mod = 0; + int amp_mod; + int pitch_mod; + int eg_mod; int aftertouch_cc; int breath_cc; @@ -80,6 +91,12 @@ public: FmMod breath; FmMod at; + Controllers() { + amp_mod = 0; + pitch_mod = 0; + eg_mod = 0; + } + void refresh() { amp_mod = 0; pitch_mod = 0;