Add support for 64bit version.

Using Oscilloscope GUI 64bit DLL Library v4.2.0 released June 15, 2021.
xioTechnologies · Nov 21, 2023 · 37b2518 · 37b2518
1 parent f831087
commit 37b2518
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/Serial Oscilloscope/Serial Oscilloscope.sln b/Serial Oscilloscope/Serial Oscilloscope.sln
@@ -1,16 +1,24 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34221.43
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serial Oscilloscope", "Serial Oscilloscope\Serial Oscilloscope.csproj", "{37F93890-5296-4350-8F67-28BCC26CD6F2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{37F93890-5296-4350-8F67-28BCC26CD6F2}.Debug|x64.ActiveCfg = Debug|x64
+		{37F93890-5296-4350-8F67-28BCC26CD6F2}.Debug|x64.Build.0 = Debug|x64
 		{37F93890-5296-4350-8F67-28BCC26CD6F2}.Debug|x86.ActiveCfg = Debug|x86
 		{37F93890-5296-4350-8F67-28BCC26CD6F2}.Debug|x86.Build.0 = Debug|x86
+		{37F93890-5296-4350-8F67-28BCC26CD6F2}.Release|x64.ActiveCfg = Release|x64
+		{37F93890-5296-4350-8F67-28BCC26CD6F2}.Release|x64.Build.0 = Release|x64
 		{37F93890-5296-4350-8F67-28BCC26CD6F2}.Release|x86.ActiveCfg = Release|x86
 		{37F93890-5296-4350-8F67-28BCC26CD6F2}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

diff --git a/Serial Oscilloscope/Serial Oscilloscope/Oscilloscope/Osc_DLL64.dll b/Serial Oscilloscope/Serial Oscilloscope/Oscilloscope/Osc_DLL64.dll
diff --git a/Serial Oscilloscope/Serial Oscilloscope/Serial Oscilloscope.csproj b/Serial Oscilloscope/Serial Oscilloscope/Serial Oscilloscope.csproj
@@ -35,6 +35,24 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -96,7 +114,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Oscilloscope\Osc_DLL.dll">
+    <Content Include="Oscilloscope\Osc_DLL.dll" Condition="'$(Platform)' == 'x86'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Oscilloscope\Osc_DLL64.dll" Condition="'$(Platform)' == 'x64'" TargetPath="Oscilloscope\Osc_DLL.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>