Skip to content

Commit

Permalink
Added skeleton files for project
Browse files Browse the repository at this point in the history
  • Loading branch information
OOPMan committed Apr 20, 2019
1 parent 6ada20e commit d945847
Show file tree
Hide file tree
Showing 5 changed files with 142 additions and 18 deletions.
68 changes: 56 additions & 12 deletions RazorAtroxWinUSBVigEmFeeder.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,78 @@ VisualStudioVersion = 15.0.28307.572
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RazorAtroxWinUSBVigEmFeeder", "RazorAtroxWinUSBVigEmFeeder\RazorAtroxWinUSBVigEmFeeder.vcxproj", "{F6104731-5815-4BBA-A558-E859DD039413}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ViGEmClient", "ViGEmClient\src\ViGEmClient.vcxproj", "{7DB06674-1F4F-464B-8E1C-172E9587F9DC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1E0515A5-B0AA-4821-90DE-C764A2C35AF2}"
ProjectSection(SolutionItems) = preProject
pre-build.cmd = pre-build.cmd
VigEmClient.patch = VigEmClient.patch
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug_DLL|x64 = Debug_DLL|x64
Debug_DLL|x86 = Debug_DLL|x86
Debug_LIB|x64 = Debug_LIB|x64
Debug_LIB|x86 = Debug_LIB|x86
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release_DLL|x64 = Release_DLL|x64
Release_DLL|x86 = Release_DLL|x86
Release_LIB|x64 = Release_LIB|x64
Release_LIB|x86 = Release_LIB|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F6104731-5815-4BBA-A558-E859DD039413}.Debug|ARM.ActiveCfg = Debug|ARM
{F6104731-5815-4BBA-A558-E859DD039413}.Debug|ARM.Build.0 = Debug|ARM
{F6104731-5815-4BBA-A558-E859DD039413}.Debug|ARM64.ActiveCfg = Debug|ARM64
{F6104731-5815-4BBA-A558-E859DD039413}.Debug|ARM64.Build.0 = Debug|ARM64
{F6104731-5815-4BBA-A558-E859DD039413}.Debug_DLL|x64.ActiveCfg = Debug|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Debug_DLL|x64.Build.0 = Debug|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Debug_DLL|x86.ActiveCfg = Debug|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Debug_DLL|x86.Build.0 = Debug|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Debug_LIB|x64.ActiveCfg = Debug|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Debug_LIB|x64.Build.0 = Debug|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Debug_LIB|x86.ActiveCfg = Debug|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Debug_LIB|x86.Build.0 = Debug|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Debug|x64.ActiveCfg = Debug|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Debug|x64.Build.0 = Debug|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Debug|x86.ActiveCfg = Debug|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Debug|x86.Build.0 = Debug|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Release|ARM.ActiveCfg = Release|ARM
{F6104731-5815-4BBA-A558-E859DD039413}.Release|ARM.Build.0 = Release|ARM
{F6104731-5815-4BBA-A558-E859DD039413}.Release|ARM64.ActiveCfg = Release|ARM64
{F6104731-5815-4BBA-A558-E859DD039413}.Release|ARM64.Build.0 = Release|ARM64
{F6104731-5815-4BBA-A558-E859DD039413}.Release_DLL|x64.ActiveCfg = Release|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Release_DLL|x64.Build.0 = Release|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Release_DLL|x86.ActiveCfg = Release|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Release_DLL|x86.Build.0 = Release|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Release_LIB|x64.ActiveCfg = Release|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Release_LIB|x64.Build.0 = Release|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Release_LIB|x86.ActiveCfg = Release|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Release_LIB|x86.Build.0 = Release|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Release|x64.ActiveCfg = Release|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Release|x64.Build.0 = Release|x64
{F6104731-5815-4BBA-A558-E859DD039413}.Release|x86.ActiveCfg = Release|Win32
{F6104731-5815-4BBA-A558-E859DD039413}.Release|x86.Build.0 = Release|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug_DLL|x64.ActiveCfg = Debug_DLL|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug_DLL|x64.Build.0 = Debug_DLL|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug_DLL|x86.ActiveCfg = Debug_DLL|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug_DLL|x86.Build.0 = Debug_DLL|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug_LIB|x64.ActiveCfg = Debug_LIB|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug_LIB|x64.Build.0 = Debug_LIB|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug_LIB|x86.ActiveCfg = Debug_LIB|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug_LIB|x86.Build.0 = Debug_LIB|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug|x64.ActiveCfg = Debug_DLL|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug|x64.Build.0 = Debug_DLL|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug|x86.ActiveCfg = Debug_LIB|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Debug|x86.Build.0 = Debug_LIB|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release_DLL|x64.ActiveCfg = Release_DLL|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release_DLL|x64.Build.0 = Release_DLL|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release_DLL|x86.ActiveCfg = Release_DLL|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release_DLL|x86.Build.0 = Release_DLL|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release_LIB|x64.ActiveCfg = Release_LIB|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release_LIB|x64.Build.0 = Release_LIB|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release_LIB|x86.ActiveCfg = Release_LIB|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release_LIB|x86.Build.0 = Release_LIB|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x64.ActiveCfg = Release_LIB|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x64.Build.0 = Release_LIB|x64
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x86.ActiveCfg = Release_DLL|Win32
{7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x86.Build.0 = Release_DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
25 changes: 23 additions & 2 deletions RazorAtroxWinUSBVigEmFeeder/RazorAtroxWinUSBVigEmFeeder.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
<ClInclude Include="device.h" />
<ClInclude Include="pch.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ViGEmClient\src\ViGEmClient.vcxproj">
<Project>{7db06674-1f4f-464b-8e1c-172e9587f9dc}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{F6104731-5815-4BBA-A558-E859DD039413}</ProjectGuid>
<TemplateGuid>{b287f7f7-abf3-440d-b608-cb36380f2981}</TemplateGuid>
Expand Down Expand Up @@ -135,9 +140,13 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<DebuggerFlavor>DbgengRemoteDebugger</DebuggerFlavor>
<IncludePath>$(SolutionDir)ViGEmClient\include;$(SolutionDir)PDCurses;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)PDCurses\wincon;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<DebuggerFlavor>DbgengRemoteDebugger</DebuggerFlavor>
<IncludePath>$(SolutionDir)ViGEmClient\include;$(SolutionDir)PDCurses;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)PDCurses\wincon;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<DebuggerFlavor>DbgengRemoteDebugger</DebuggerFlavor>
Expand Down Expand Up @@ -172,18 +181,30 @@
<ClCompile>
<PreprocessorDefinitions>_DEBUG;WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;WINAPI_PARTITION_DESKTOP=1;WINAPI_PARTITION_SYSTEM=1;WINAPI_PARTITION_APP=1;WINAPI_PARTITION_PC_APP=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWarningAsError>false</TreatWarningAsError>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies);onecoreuap.lib;winusb.lib</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies);onecoreuap.lib;winusb.lib;pdcurses.lib</AdditionalDependencies>
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
</Link>
<PreBuildEvent>
<Command>cd $(SolutionDir) &amp; call pre-build.cmd</Command>
<Message>Pre-build tasks</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;WINAPI_PARTITION_DESKTOP=1;WINAPI_PARTITION_SYSTEM=1;WINAPI_PARTITION_APP=1;WINAPI_PARTITION_PC_APP=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>false</TreatWarningAsError>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies);onecoreuap.lib;winusb.lib</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies);onecoreuap.lib;winusb.lib;pdcurses.lib</AdditionalDependencies>
<TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
</Link>
<PreBuildEvent>
<Command>cd $(SolutionDir) &amp; call pre-build.cmd</Command>
<Message>Pre-build tasks</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
<Extensions>inf;inv;inx;mof;mc;</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="device.h">
<Filter>Header Files</Filter>
Expand All @@ -37,4 +34,7 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
<ItemGroup>
<None Include="ReadMe.txt" />
</ItemGroup>
</Project>
48 changes: 48 additions & 0 deletions VigEmClient.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
diff --git a/src/ViGEmClient.cpp b/src/ViGEmClient.cpp
index 3d499e1..2ab7d8a 100644
--- a/src/ViGEmClient.cpp
+++ b/src/ViGEmClient.cpp
@@ -22,8 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

-
-#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <SetupAPI.h>
#include <initguid.h>
diff --git a/src/ViGEmClient.vcxproj b/src/ViGEmClient.vcxproj
index da880bf..f7a318f 100644
--- a/src/ViGEmClient.vcxproj
+++ b/src/ViGEmClient.vcxproj
@@ -75,26 +75,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_LIB|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_DLL|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_LIB|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_DLL|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v141</PlatformToolset>
+ <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
11 changes: 11 additions & 0 deletions pre-build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ECHO OFF
ECHO Ensuring sub-modules are available
git submodule init
git submodule update
ECHO Patching VigEmClient
CD VigEmClient
git apply ..\VigEmClient.patch 2>nul & exit 0
CD ..
ECHO Building pdcurses
CD PDCurses\wincon
nmake -f Makefile.vc WIDE=Y UTF8=Y

0 comments on commit d945847

Please sign in to comment.