Quellcode durchsuchen

fix oxford reference problem (through modify the proj file)

gsp vor 2 Jahren
Ursprung
Commit
d615a7c610

+ 10 - 9
OTSCPP/OTSControl/OTSControl.vcxproj

@@ -48,7 +48,7 @@
     <RootNamespace>OTSControl</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <Keyword>MFCDLLProj</Keyword>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -619,6 +619,7 @@
   <ItemGroup>
     <Reference Include="OINA.Extender">
       <HintPath>..\OpenDll\OxfordApi50Dll\OINA.Extender.dll</HintPath>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -629,35 +630,35 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\OpenDll\OxfordApiDll\apidsp_windows.dll">
+    <Content Include="..\OpenDll\OxfordApi50Dll\apidsp_windows.dll">
       <Link>apidsp_windows.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\OpenDll\OxfordApiDll\apidsp_windows_x64.dll">
+    <Content Include="..\OpenDll\OxfordApi50Dll\apidsp_windows_x64.dll">
       <Link>apidsp_windows_x64.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\OpenDll\OxfordApiDll\hasp_net_windows.dll">
+    <Content Include="..\OpenDll\OxfordApi50Dll\hasp_net_windows.dll">
       <Link>hasp_net_windows.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\OpenDll\OxfordApiDll\hasp_windows_50590.dll">
+    <Content Include="..\OpenDll\OxfordApi50Dll\hasp_windows_50590.dll">
       <Link>hasp_windows_50590.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\OpenDll\OxfordApiDll\hasp_windows_x64_50590.dll">
+    <Content Include="..\OpenDll\OxfordApi50Dll\hasp_windows_x64_50590.dll">
       <Link>hasp_windows_x64_50590.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\OpenDll\OxfordApiDll\OINA.SNSLicenseProvider.dll">
+    <Content Include="..\OpenDll\OxfordApi50Dll\OINA.SNSLicenseProvider.dll">
       <Link>OINA.SNSLicenseProvider.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\OpenDll\OxfordApiDll\x64\OINA.Ipp.dll">
+    <Content Include="..\OpenDll\OxfordApi50Dll\x64\OINA.Ipp.Native.dll">
       <Link>x64\OINA.Ipp.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\OpenDll\OxfordApiDll\x86\OINA.Ipp.dll">
+    <Content Include="..\OpenDll\OxfordApi50Dll\x86\OINA.Ipp.Native.dll">
       <Link>x86\OINA.Ipp.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

+ 1 - 1
OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -89,7 +89,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford50|x64'">
-    <OutputPath>..\bin\x64\Release_oxford50\</OutputPath>
+    <OutputPath>..\Bin\x64\Release_oxford50\</OutputPath>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>

+ 1 - 1
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -99,7 +99,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford50|x64'">
-    <OutputPath>..\bin\x64\Release_oxford50\</OutputPath>
+    <OutputPath>..\Bin\x64\Release_oxford50\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>pdbonly</DebugType>

+ 1 - 1
OTSSysMgrApp/OTSSysMgrApp.csproj

@@ -85,7 +85,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford50|x64'">
-    <OutputPath>..\bin\x64\Release_oxford50\</OutputPath>
+    <OutputPath>..\Bin\x64\Release_oxford50\</OutputPath>
     <DefineConstants>
     </DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>