From 9d27438638fa437dd2aa63a75de35aa71cd1683d Mon Sep 17 00:00:00 2001 From: Pascal Gauthier Date: Sun, 26 Jan 2014 14:52:16 -0500 Subject: [PATCH] Preliminary x64 windows support --- Builds/VisualStudio2012/Dexed.sln | 12 +- Builds/VisualStudio2012/Dexed.v11.suo | Bin 22528 -> 30720 bytes Builds/VisualStudio2012/Dexed.vcxproj | 1041 +++++++++-------- Builds/VisualStudio2012/Dexed.vcxproj.filters | 88 +- Source/DXComponents.cpp | 6 +- Source/PluginParam.cpp | 4 +- 6 files changed, 596 insertions(+), 555 deletions(-) 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 6c8e5c364851f21f58b44867e9baf6e87de4a7aa..247bdafdb165fd38a94568c9fa5c8c93fa8f9088 100644 GIT binary patch delta 4009 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 O*M=b+2uH(nVfHsuoze9G diff --git a/Builds/VisualStudio2012/Dexed.vcxproj b/Builds/VisualStudio2012/Dexed.vcxproj index 9ccec7a..525b8e9 100644 --- a/Builds/VisualStudio2012/Dexed.vcxproj +++ b/Builds/VisualStudio2012/Dexed.vcxproj @@ -1,27 +1,40 @@ - - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {1A9EF105-5BF5-9FB6-9634-A91A6D840866} v110 - + DynamicLibrary false MultiByte v110 + + DynamicLibrary + false + MultiByte + v110 + DynamicLibrary false @@ -29,11 +42,17 @@ true v110 - - + + DynamicLibrary + false + MultiByte + true + v110 + + + - + v110 @@ -42,10 +61,14 @@ <_ProjectFileVersion>10.0.30319.1 .\Debug\ Dexed + Dexed true + true .\Release\ Dexed + Dexed true + true v110 @@ -54,7 +77,7 @@ true true Win32 - + Disabled @@ -63,7 +86,7 @@ WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) MultiThreadedDebug true - + $(IntDir)\ $(IntDir)\ $(IntDir)\ @@ -90,13 +113,55 @@ $(IntDir)\Dexed.bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + + + + + Disabled + ProgramDatabase + ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;C:\work\vstsdk2.4;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) + MultiThreadedDebug + 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 + + + true + $(IntDir)\Dexed.bsc + + NDEBUG;%(PreprocessorDefinitions) true true Win32 - + MinSpace @@ -104,7 +169,7 @@ WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) MultiThreaded true - + $(IntDir)\ $(IntDir)\ $(IntDir)\ @@ -132,25 +197,67 @@ $(IntDir)\Dexed.bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + + + + + MinSpace + ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;C:\work\vstsdk2.4;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) + MultiThreaded + true + + + $(IntDir)\ + $(IntDir)\ + $(IntDir)\ + Level4 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + + + $(OutDir)\Dexed.dll + true + %(IgnoreSpecificDefaultLibraries) + false + $(IntDir)\Dexed.pdb + Windows + true + true + true + + + true + $(IntDir)\Dexed.bsc + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + true @@ -1081,20 +1188,20 @@ true - - - - - - - - - - - - - - + + + + + + + + + + + + + + StdCall @@ -1110,434 +1217,434 @@ StdCall - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - + + + \ No newline at end of file diff --git a/Builds/VisualStudio2012/Dexed.vcxproj.filters b/Builds/VisualStudio2012/Dexed.vcxproj.filters index 3569e1b..2ad191a 100644 --- a/Builds/VisualStudio2012/Dexed.vcxproj.filters +++ b/Builds/VisualStudio2012/Dexed.vcxproj.filters @@ -1,5 +1,4 @@ - - + @@ -376,9 +375,6 @@ Juce Modules\juce_audio_basics\synthesisers - - Juce Modules\juce_audio_plugin_client\AU - Juce Modules\juce_audio_plugin_client\RTAS @@ -394,21 +390,12 @@ Juce Modules\juce_audio_plugin_client\RTAS - - Juce Modules\juce_audio_plugin_client\RTAS - Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client\VST - Juce Modules\juce_audio_plugin_client\AAX - - Juce Modules\juce_audio_plugin_client\AAX - Juce Modules\juce_audio_plugin_client\utility @@ -433,9 +420,6 @@ Juce Modules\juce_audio_processors\format - - Juce Modules\juce_audio_processors\format_types - Juce Modules\juce_audio_processors\format_types @@ -670,21 +654,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 @@ -754,15 +723,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 @@ -862,12 +825,6 @@ Juce Modules\juce_graphics\native - - Juce Modules\juce_graphics\native - - - Juce Modules\juce_graphics\native - Juce Modules\juce_graphics\native @@ -1222,12 +1179,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 @@ -1237,21 +1188,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 @@ -1297,27 +1233,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 @@ -1387,6 +1311,14 @@ Juce Library Code + + + + + + + + @@ -2654,4 +2586,4 @@ Juce Library Code - + \ No newline at end of file diff --git a/Source/DXComponents.cpp b/Source/DXComponents.cpp index 74d2824..8b3c59f 100644 --- a/Source/DXComponents.cpp +++ b/Source/DXComponents.cpp @@ -195,11 +195,7 @@ void PitchEnvDisplay::paint(Graphics &g) { dist[0] = dist[1] = dist[2] = dist[3] = 1; total = 4; } - - TRACE("total %f", total); - TRACE("level %d %d %d %d", levels[0], levels[1], levels[2], levels[3]); - TRACE("dist %f %f %f %f", dist[0], dist[1], dist[2], dist[3]); - + // TODO : this is WIP float ratio = 96 / total; diff --git a/Source/PluginParam.cpp b/Source/PluginParam.cpp index 01fe8af..243b247 100755 --- a/Source/PluginParam.cpp +++ b/Source/PluginParam.cpp @@ -18,12 +18,12 @@ * Boston, MA 02110-1301 USA. */ +#include + #include "PluginParam.h" #include "PluginProcessor.h" #include "PluginEditor.h" - - // ************************************************************************ // Ctrl::Ctrl(String name) {