Merge pull request #248 from ramdor/dev5

Final push for v2.10.3
ramdor · Nov 2, 2023 · e752c60 · e752c60
2 parents 40b1b9e + 561a8bc
commit e752c60
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/Project Files/Source/ChannelMaster/ChannelMaster.vcxproj b/Project Files/Source/ChannelMaster/ChannelMaster.vcxproj
@@ -98,7 +98,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CHANNELMASTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\wdsp;.;../../lib/portaudio_VS2008/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\wdsp;.;../../lib/portaudio-19.7.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <CompileAs>CompileAsC</CompileAs>
@@ -148,7 +148,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_WINDOWS;_USRDLL;CHANNELMASTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\wdsp;.;../../lib/portaudio_VS2008/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\wdsp;.;../../lib/portaudio-19.7.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

diff --git a/Project Files/Source/Console/frmReleaseNotes.cs b/Project Files/Source/Console/frmReleaseNotes.cs
@@ -36,6 +36,7 @@ public void ShowReleaseNotes()
         {
             try
             {
+                if (this.Visible) return;
                 Opacity = 0f;
                 string file = Path.Combine(_releaseNotesPath, "ReleaseNotes.txt");
                 if (!File.Exists(file)) return;

diff --git a/Project Files/Source/Console/titlebar.cs b/Project Files/Source/Console/titlebar.cs
@@ -34,7 +34,7 @@ namespace Thetis
 {
     class TitleBar
     {
-        public const string BUILD_NAME = "dev5-build-0";
+        public const string BUILD_NAME = "";
         //[2.10.2.2]MW0LGE pre-build event script auto build date
         //public const string BUILD_DATE = "(10/11/23)<FW>"; //MW0LGE_21g <FW> gets replaced in BasicTitle (console.cs) with firmware version
 

diff --git a/Project Files/Source/ReleaseNotes.txt b/Project Files/Source/ReleaseNotes.txt
@@ -7,9 +7,9 @@ If you use CW and you have different RX and TX antenna ports configured, there i
 ## v2.10.3 Release
 
 1) PortAudio has been updated to 19.7.0. This brings with it WASAPI support, with exclusive use options
-2) Skins can now be downloaded and updated from within Thetis. Check them out in the Appearance, Skin Servers tab. Please see video VVVVVVV
-3) A new menu bar item exists, Finder. Find any control, setting or text in Thetis, click it and it will take you there. Please see video VVVV
-4) CFC display has had an update. I may bring this to a multimeter near you in the future
+2) Skins can now be downloaded and updated from within Thetis. Check them out in the Appearance, Skin Servers tab
+3) A new menu bar item exists, Finder. Find any control, setting or text in Thetis, click it and it will take you there
+4) CFC display has had an update
 5) FM AF filters for RX and TX, low and high cut
 6) Mic phase reversal
 7) Re-alignment and improvements of UI by Sigi DH1KLM

diff --git a/Project Files/lib/portaudio-19.7.0/build/msvc/portaudio.vcxproj b/Project Files/lib/portaudio-19.7.0/build/msvc/portaudio.vcxproj
@@ -83,8 +83,8 @@
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)..\build\$(HPSDR_PLATFORM)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\build\$(HPSDR_PLATFORM)\$(Configuration)\portaudio\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -209,7 +209,7 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)/portaudio.pch</PrecompiledHeaderOutputFile>
+      <PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)\portaudio.pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation>
       <ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName>
       <ProgramDataBaseFileName>$(Platform)\$(Configuration)\</ProgramDataBaseFileName>
@@ -222,13 +222,14 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>$(Platform)\$(Configuration)\portaudio_x86.dll</OutputFile>
+      <OutputFile>$(SolutionDir)..\bin\$(HPSDR_PLATFORM)\$(Configuration)\PA19.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ModuleDefinitionFile>.\portaudio.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(Platform)\$(Configuration)\portaudio_x86.pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(Platform)\$(Configuration)\portaudio_x86.lib</ImportLibrary>
+      <ProgramDatabaseFile>..\..\..\..\build\$(HPSDR_PLATFORM)\$(Configuration)\PA19.pdb</ProgramDatabaseFile>
+      <ImportLibrary>..\..\..\..\build\$(HPSDR_PLATFORM)\$(Configuration)\PA19.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>