From 1c26d41c9a16347e776fb71adf854ad654ef7324 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 27 Dec 2014 17:49:45 +0100 Subject: [PATCH] Externals: steal & modify hidapi.vcxproj from Armada --- Externals/hidapi/hidapi.vcxproj | 43 +++++++++++++++++++++++++++++++++ Source/VSProps/Base.props | 1 + Source/dolphin-emu.sln | 8 ++++++ 3 files changed, 52 insertions(+) create mode 100644 Externals/hidapi/hidapi.vcxproj diff --git a/Externals/hidapi/hidapi.vcxproj b/Externals/hidapi/hidapi.vcxproj new file mode 100644 index 0000000000..8be14179f7 --- /dev/null +++ b/Externals/hidapi/hidapi.vcxproj @@ -0,0 +1,43 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {549D32D8-1640-46F9-9D78-BAE6EB0D723D} + + + + StaticLibrary + v120 + Unicode + + + true + + + false + + + + + + + + + + + + + + + + + diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index a845de72d6..c2c26b9965 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -47,6 +47,7 @@ $(ExternalsDir)wxWidgets3;%(AdditionalIncludeDirectories) $(ExternalsDir)wxWidgets3\Include;%(AdditionalIncludeDirectories) $(ExternalsDir)zlib;%(AdditionalIncludeDirectories) + $(ExternalsDir)hidapi\hidapi;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) USE_UPNP;%(PreprocessorDefinitions) PSAPI_VERSION=1;_M_X86=1;%(PreprocessorDefinitions) diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index bd6ccd63b2..176b6f5dab 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -67,6 +67,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pch", "PCH\pch.vcxproj", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{474661E7-C73A-43A6-AFEE-EE1EC433D49E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidapi", "..\Externals\hidapi\hidapi.vcxproj", "{549D32D8-1640-46F9-9D78-BAE6EB0D723D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -189,6 +191,10 @@ Global {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.Build.0 = Debug|x64 {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.ActiveCfg = Release|x64 {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.Build.0 = Release|x64 + {549D32D8-1640-46F9-9D78-BAE6EB0D723D}.Debug|x64.ActiveCfg = Debug|x64 + {549D32D8-1640-46F9-9D78-BAE6EB0D723D}.Debug|x64.Build.0 = Debug|x64 + {549D32D8-1640-46F9-9D78-BAE6EB0D723D}.Release|x64.ActiveCfg = Release|x64 + {549D32D8-1640-46F9-9D78-BAE6EB0D723D}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -218,5 +224,7 @@ Global {A4C423AA-F57C-46C7-A172-D1A777017D29} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {76563A7F-1011-4EAD-B667-7BB18D09568E} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} + {96020103-4BA5-4FD2-B4AA-5B6D24492D4E} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} + {549D32D8-1640-46F9-9D78-BAE6EB0D723D} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} EndGlobalSection EndGlobal