clean up and got release build

alexgubanow · Jul 31, 2020 · e03532c · e03532c
1 parent 0f8cdd8
commit e03532c
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 116 deletions.
diff --git a/hidapiw.sln b/hidapiw.sln
@@ -17,14 +17,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A25A4B7E-7332-40BC-A944-F9517EF456A8}.Debug|x64.ActiveCfg = Debug|x64
-		{A25A4B7E-7332-40BC-A944-F9517EF456A8}.Debug|x64.Build.0 = Debug|x64
-		{A25A4B7E-7332-40BC-A944-F9517EF456A8}.Debug|x86.ActiveCfg = Debug|x86
-		{A25A4B7E-7332-40BC-A944-F9517EF456A8}.Debug|x86.Build.0 = Debug|x86
-		{A25A4B7E-7332-40BC-A944-F9517EF456A8}.Release|x64.ActiveCfg = Release|Any CPU
-		{A25A4B7E-7332-40BC-A944-F9517EF456A8}.Release|x64.Build.0 = Release|Any CPU
-		{A25A4B7E-7332-40BC-A944-F9517EF456A8}.Release|x86.ActiveCfg = Release|Any CPU
-		{A25A4B7E-7332-40BC-A944-F9517EF456A8}.Release|x86.Build.0 = Release|Any CPU
 		{707EB569-886D-480C-BB86-1A3787B71BEC}.Debug|x64.ActiveCfg = Debug|x64
 		{707EB569-886D-480C-BB86-1A3787B71BEC}.Debug|x64.Build.0 = Debug|x64
 		{707EB569-886D-480C-BB86-1A3787B71BEC}.Debug|x86.ActiveCfg = Debug|Win32
@@ -37,10 +29,10 @@ Global
 		{98702AB4-A467-486E-8373-6565E11F5BB4}.Debug|x64.Build.0 = Debug|x64
 		{98702AB4-A467-486E-8373-6565E11F5BB4}.Debug|x86.ActiveCfg = Debug|x86
 		{98702AB4-A467-486E-8373-6565E11F5BB4}.Debug|x86.Build.0 = Debug|x86
-		{98702AB4-A467-486E-8373-6565E11F5BB4}.Release|x64.ActiveCfg = Release|Any CPU
-		{98702AB4-A467-486E-8373-6565E11F5BB4}.Release|x64.Build.0 = Release|Any CPU
-		{98702AB4-A467-486E-8373-6565E11F5BB4}.Release|x86.ActiveCfg = Release|Any CPU
-		{98702AB4-A467-486E-8373-6565E11F5BB4}.Release|x86.Build.0 = Release|Any CPU
+		{98702AB4-A467-486E-8373-6565E11F5BB4}.Release|x64.ActiveCfg = Release|x64
+		{98702AB4-A467-486E-8373-6565E11F5BB4}.Release|x64.Build.0 = Release|x64
+		{98702AB4-A467-486E-8373-6565E11F5BB4}.Release|x86.ActiveCfg = Release|x86
+		{98702AB4-A467-486E-8373-6565E11F5BB4}.Release|x86.Build.0 = Release|x86
 		{3D753EEE-D6A9-4F23-A28E-188ED637A991}.Debug|x64.ActiveCfg = Debug|x64
 		{3D753EEE-D6A9-4F23-A28E-188ED637A991}.Debug|x64.Build.0 = Debug|x64
 		{3D753EEE-D6A9-4F23-A28E-188ED637A991}.Debug|x86.ActiveCfg = Debug|Win32

diff --git a/hidapiw/AssemblyInfo.cpp b/hidapiw/AssemblyInfo.cpp
@@ -1,5 +1,3 @@
-#include "pch.h"
-
 using namespace System;
 using namespace System::Reflection;
 using namespace System::Runtime::CompilerServices;
@@ -9,7 +7,7 @@ using namespace System::Security::Permissions;
 [assembly:AssemblyTitleAttribute(L"hidapiwnative")];
 [assembly:AssemblyDescriptionAttribute(L"")];
 [assembly:AssemblyConfigurationAttribute(L"")];
-[assembly:AssemblyCompanyAttribute(L"")];
+[assembly:AssemblyCompanyAttribute(L"0x0h")];
 [assembly:AssemblyProductAttribute(L"hidapiwnative")];
 [assembly:AssemblyCopyrightAttribute(L"Copyright (c)  2020")];
 [assembly:AssemblyTrademarkAttribute(L"")];

diff --git a/hidapiw/hidapiw.cpp b/hidapiw/hidapiw.cpp
@@ -1,4 +1,3 @@
-#include "pch.h"
 #include "hidapiw.h"
 
 hidapiw::hidapiw()

diff --git a/hidapiw/hidapiw.vcxproj b/hidapiw/hidapiw.vcxproj
@@ -77,6 +77,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\netcoreapp3.1\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\netcoreapp3.1\</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -90,7 +93,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -112,7 +115,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -124,18 +127,11 @@
   <ItemGroup>
     <ClInclude Include="hidapiw.h" />
     <ClInclude Include="hidDeviceInfo.hpp" />
-    <ClInclude Include="pch.h" />
     <ClInclude Include="Resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AssemblyInfo.cpp" />
     <ClCompile Include="hidapiw.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="app.rc" />

diff --git a/hidapiw/hidapiw.vcxproj.filters b/hidapiw/hidapiw.vcxproj.filters
@@ -18,9 +18,6 @@
     <ClInclude Include="Resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="hidDeviceInfo.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -32,9 +29,6 @@
     <ClCompile Include="AssemblyInfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="hidapiw.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/hidapiw/pch.cpp b/hidapiw/pch.cpp
diff --git a/hidapiw/pch.h b/hidapiw/pch.h
diff --git a/hidapiw_native/dllmain.cpp b/hidapiw_native/dllmain.cpp
diff --git a/hidapiw_native/framework.h b/hidapiw_native/framework.h
diff --git a/hidapiw_native/hidapiw_native.cpp b/hidapiw_native/hidapiw_native.cpp
@@ -1,4 +1,3 @@
-#include "pch.h"
 #define NATIVE_CODE
 #include "hidapiw_native.h"
 

diff --git a/hidapiw_native/hidapiw_native.vcxproj b/hidapiw_native/hidapiw_native.vcxproj
@@ -47,7 +47,7 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -83,10 +83,11 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\netcoreapp3.1\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;HIDAPIWCPP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -135,7 +136,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -153,19 +154,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="framework.h" />
     <ClInclude Include="hidapiw_native.h" />
-    <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="hidapiw_native.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/hidapiw_native/hidapiw_native.vcxproj.filters b/hidapiw_native/hidapiw_native.vcxproj.filters
@@ -15,23 +15,11 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="framework.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="hidapiw_native.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dllmain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="hidapiw_native.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/hidapiw_native/pch.cpp b/hidapiw_native/pch.cpp
diff --git a/hidapiw_native/pch.h b/hidapiw_native/pch.h
diff --git a/testConsole/testConsole.csproj b/testConsole/testConsole.csproj
@@ -3,13 +3,17 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Platforms>AnyCPU;x64;x86</Platforms>
+    <Platforms>x64;x86</Platforms>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutputPath>..\x64\Debug\</OutputPath>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutputPath>..\x64\Release\</OutputPath>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\hidapiw\hidapiw.vcxproj" />
   </ItemGroup>