diff --git a/Builds/VisualStudio2012/M-QAM Transceiver.sdf b/Builds/VisualStudio2012/M-QAM Transceiver.sdf index 9d453e2..af9eeee 100644 Binary files a/Builds/VisualStudio2012/M-QAM Transceiver.sdf and b/Builds/VisualStudio2012/M-QAM Transceiver.sdf differ diff --git a/Builds/VisualStudio2012/M-QAM Transceiver.sln b/Builds/VisualStudio2012/M-QAM Transceiver.sln index 830d590..23a7c53 100644 --- a/Builds/VisualStudio2012/M-QAM Transceiver.sln +++ b/Builds/VisualStudio2012/M-QAM Transceiver.sln @@ -1,6 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M-QAM Transceiver", "M-QAM Transceiver.vcxproj", "{F4982237-0D0C-2DF9-224A-BFCB25D8B413}" +Project("{DCE3D67B-5AAD-3549-305E-DD32BC645203}") = "M-QAM Transceiver", "M-QAM Transceiver.vcxproj", "{F4982237-0D0C-2DF9-224A-BFCB25D8B413}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -16,7 +16,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection EndGlobal diff --git a/Builds/VisualStudio2012/M-QAM Transceiver.v11.suo b/Builds/VisualStudio2012/M-QAM Transceiver.v11.suo index dbae9a0..f63a1da 100644 Binary files a/Builds/VisualStudio2012/M-QAM Transceiver.v11.suo and b/Builds/VisualStudio2012/M-QAM Transceiver.v11.suo differ diff --git a/Builds/VisualStudio2012/M-QAM Transceiver.vcxproj b/Builds/VisualStudio2012/M-QAM Transceiver.vcxproj index 39ba254..a8f9d95 100644 --- a/Builds/VisualStudio2012/M-QAM Transceiver.vcxproj +++ b/Builds/VisualStudio2012/M-QAM Transceiver.vcxproj @@ -1,4 +1,5 @@ - + + @@ -13,9 +14,8 @@ {F4982237-0D0C-2DF9-224A-BFCB25D8B413} v110 - M-QAM Transceiver - + Application false @@ -27,10 +27,11 @@ true v110 - - + + - + v110 @@ -51,25 +52,22 @@ true true Win32 - + Disabled EditAndContinue - ..\..\..\..\..\libsrc;..\..\..\..\..\include;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories) - RADIO_NEW_API;fir_float_t=float;radio_float_t=float;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) + ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../../../../extLib/eigen3;../../../../libsrc;../../../../libsrc/cpp;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;DEBUG;_DEBUG;EIGEN_RUNTIME_NO_MALLOC;radio_float_t=float;fir_float_t=float;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) MultiThreadedDebug true - + $(IntDir)\ $(IntDir)\ $(IntDir)\ Level4 true true - Default - AdvancedVectorExtensions - Fast _DEBUG;%(PreprocessorDefinitions) @@ -96,29 +94,21 @@ true true Win32 - + - MaxSpeed - ..\..\..\..\..\libsrc;..\..\..\..\..\include;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories) - RADIO_NEW_API;fir_float_t=float;radio_float_t=float;WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) + MinSpace + ..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;../../../../../extLib/eigen3;../../../../libsrc;../../../../libsrc/cpp;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;EIGEN_RUNTIME_NO_MALLOC;radio_float_t=float;fir_float_t=float;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;%(PreprocessorDefinitions) MultiThreaded true - + $(IntDir)\ $(IntDir)\ $(IntDir)\ Level4 true true - false - ProgramDatabase - AnySuitable - Speed - AdvancedVectorExtensions - AssemblyAndSourceCode - true - Fast NDEBUG;%(PreprocessorDefinitions) @@ -127,7 +117,7 @@ $(OutDir)\M-QAM Transceiver.exe true %(IgnoreSpecificDefaultLibraries) - true + false $(IntDir)\M-QAM Transceiver.pdb Windows MachineX86 @@ -141,28 +131,25 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + true @@ -379,6 +366,9 @@ true + + true + true @@ -1174,6 +1164,9 @@ true + + true + true @@ -1243,6 +1236,12 @@ true + + true + + + true + true @@ -1255,516 +1254,514 @@ true - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - \ No newline at end of file + + + diff --git a/Builds/VisualStudio2012/M-QAM Transceiver.vcxproj.filters b/Builds/VisualStudio2012/M-QAM Transceiver.vcxproj.filters index 56c4d72..2233613 100644 --- a/Builds/VisualStudio2012/M-QAM Transceiver.vcxproj.filters +++ b/Builds/VisualStudio2012/M-QAM Transceiver.vcxproj.filters @@ -1,6 +1,13 @@ - + + + + {545F8F92-FF4F-8694-76AB-260E89DEFE7C} + + + {C39980AD-8D9D-CF64-D6D5-F41B98BC8A52} + {422C46B7-0467-2DB0-BF3C-16DFCAFD69AC} @@ -277,6 +284,12 @@ {2D8D0E19-E676-83EB-38D9-F73500DD6B79} + + {B3141847-8F13-F67D-45B2-E3ECF6E09088} + + + {9E586194-C056-101C-5311-F2AF5191AC80} + {151B49D8-6102-F802-1C07-D59931BC0574} @@ -295,17 +308,50 @@ {8B4D1BAA-6DB4-CAEC-A0FA-271F354D5C61} - - {766672D9-3F7C-1629-041E-BF8BFAFF00BF} - - - {BCF27037-3320-CAB7-1948-361ABACBC49F} - - - {8cf2349c-908b-40f9-9f9e-adb229bcb0bd} - + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + M-QAM Transceiver\Source @@ -423,6 +469,12 @@ Juce Modules\juce_audio_devices\native + + Juce Modules\juce_audio_devices\native + + + Juce Modules\juce_audio_devices\native + Juce Modules\juce_audio_devices\native @@ -519,6 +571,9 @@ Juce Modules\juce_audio_processors\format + + Juce Modules\juce_audio_processors\format_types + Juce Modules\juce_audio_processors\format_types @@ -537,6 +592,9 @@ Juce Modules\juce_audio_processors\scanning + + Juce Modules\juce_audio_utils\gui + Juce Modules\juce_audio_utils\gui @@ -759,6 +817,21 @@ 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 @@ -846,9 +919,15 @@ 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 @@ -948,6 +1027,12 @@ Juce Modules\juce_graphics\native + + Juce Modules\juce_graphics\native + + + Juce Modules\juce_graphics\native + Juce Modules\juce_graphics\native @@ -1296,6 +1381,12 @@ Juce Modules\juce_gui_basics\native + + Juce Modules\juce_gui_basics\native + + + Juce Modules\juce_gui_basics\native + Juce Modules\juce_gui_basics\native @@ -1305,6 +1396,21 @@ 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 @@ -1332,6 +1438,9 @@ Juce Modules\juce_gui_extra\documents + + Juce Modules\juce_gui_extra\misc + Juce Modules\juce_gui_extra\misc @@ -1359,15 +1468,27 @@ 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 @@ -1401,9 +1522,21 @@ Juce Modules\juce_opengl\opengl + + Juce Modules\juce_opengl\utils + + + Juce Modules\juce_video\capture + Juce Modules\juce_video\native + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + Juce Modules\juce_video\native @@ -1455,66 +1588,53 @@ Juce Library Code - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\Source - - - M-QAM Transceiver\Source - - - M-QAM Transceiver\Source - - - M-QAM Transceiver\Source - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\Source - + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + + + M-QAM Transceiver\Source + M-QAM Transceiver\Source @@ -1593,7 +1713,7 @@ Juce Modules\juce_audio_basics\synthesisers - + Juce Modules\juce_audio_basics @@ -1632,7 +1752,7 @@ Juce Modules\juce_audio_devices\native - + Juce Modules\juce_audio_devices @@ -1689,7 +1809,7 @@ Juce Modules\juce_audio_formats\sampler - + Juce Modules\juce_audio_formats @@ -1710,6 +1830,9 @@ Juce Modules\juce_audio_processors\processors + + Juce Modules\juce_audio_processors\processors + Juce Modules\juce_audio_processors\processors @@ -1752,9 +1875,12 @@ Juce Modules\juce_audio_processors\scanning - + Juce Modules\juce_audio_processors + + Juce Modules\juce_audio_utils\gui + Juce Modules\juce_audio_utils\gui @@ -1773,7 +1899,7 @@ Juce Modules\juce_audio_utils\players - + Juce Modules\juce_audio_utils @@ -1827,6 +1953,9 @@ Juce Modules\juce_core\maths + + Juce Modules\juce_core\maths + Juce Modules\juce_core\maths @@ -2046,6 +2175,9 @@ Juce Modules\juce_core\logging + + Juce Modules\juce_core\system + Juce Modules\juce_core\system @@ -2106,7 +2238,7 @@ Juce Modules\juce_core\native - + Juce Modules\juce_core @@ -2124,7 +2256,7 @@ Juce Modules\juce_cryptography\hashing - + Juce Modules\juce_cryptography @@ -2145,7 +2277,7 @@ Juce Modules\juce_data_structures\app_properties - + Juce Modules\juce_data_structures @@ -2169,6 +2301,9 @@ Juce Modules\juce_events\messages + + Juce Modules\juce_events\messages + Juce Modules\juce_events\messages @@ -2214,7 +2349,7 @@ Juce Modules\juce_events\native - + Juce Modules\juce_events @@ -2328,7 +2463,7 @@ Juce Modules\juce_graphics\native - + Juce Modules\juce_graphics @@ -2712,7 +2847,7 @@ Juce Modules\juce_gui_basics\native - + Juce Modules\juce_gui_basics @@ -2748,6 +2883,9 @@ Juce Modules\juce_gui_extra\embedding + + Juce Modules\juce_gui_extra\misc + Juce Modules\juce_gui_extra\misc @@ -2781,15 +2919,9 @@ Juce Modules\juce_gui_extra\native - + Juce Modules\juce_gui_extra - - Juce Modules\juce_opengl\opengl - - - Juce Modules\juce_opengl\opengl - Juce Modules\juce_opengl\opengl @@ -2817,11 +2949,20 @@ Juce Modules\juce_opengl\opengl - - Juce Modules\juce_opengl\opengl + + Juce Modules\juce_opengl\geometry - - Juce Modules\juce_opengl\opengl + + Juce Modules\juce_opengl\geometry + + + Juce Modules\juce_opengl\geometry + + + Juce Modules\juce_opengl\geometry + + + Juce Modules\juce_opengl\utils Juce Modules\juce_opengl\native @@ -2844,7 +2985,7 @@ Juce Modules\juce_opengl\native - + Juce Modules\juce_opengl @@ -2856,7 +2997,7 @@ Juce Modules\juce_video\capture - + Juce Modules\juce_video @@ -2865,109 +3006,48 @@ Juce Library Code - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\Source - - - M-QAM Transceiver\Source - - - M-QAM Transceiver\Source - - - M-QAM Transceiver\Source - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\libRadio - - - M-QAM Transceiver\Source - - + Juce Modules\juce_audio_basics - + Juce Modules\juce_audio_devices - + Juce Modules\juce_audio_formats - + Juce Modules\juce_audio_processors - + Juce Modules\juce_audio_utils - + Juce Modules\juce_core - + Juce Modules\juce_cryptography - + Juce Modules\juce_data_structures - + Juce Modules\juce_events - + Juce Modules\juce_graphics - + Juce Modules\juce_gui_basics - + Juce Modules\juce_gui_extra - + Juce Modules\juce_opengl - + Juce Modules\juce_video @@ -2976,4 +3056,4 @@ Juce Library Code - \ No newline at end of file + diff --git a/Builds/VisualStudio2012/resources.rc b/Builds/VisualStudio2012/resources.rc index 025f4eb..fa47500 100644 --- a/Builds/VisualStudio2012/resources.rc +++ b/Builds/VisualStudio2012/resources.rc @@ -13,6 +13,7 @@ BEGIN BEGIN BLOCK "040904E4" BEGIN + VALUE "CompanyName", "JDI\0" VALUE "FileDescription", "M-QAM Transceiver\0" VALUE "FileVersion", "1.0.0\0" VALUE "ProductName", "M-QAM Transceiver\0"