From 7a47d702297fa123da7170f498e63ccb43065a53 Mon Sep 17 00:00:00 2001
From: Tom Williams <thomaswilliams@xmos.com>
Date: Wed, 1 Feb 2023 13:40:54 +0000
Subject: [PATCH] Revert "added path variable to link project to sdk"

This reverts commit cffd35d146ced48929d05ede59d316a19b293cc8.
---
 .../host_usb_mixer_control.vcxproj              | 17 ++++++++---------
 .../host_usb_mixer_control.vcxproj.filters      |  8 ++++----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/host_usb_mixer_control/host_usb_mixer_control.vcxproj b/host_usb_mixer_control/host_usb_mixer_control.vcxproj
index d53fe39c..bf2ba970 100644
--- a/host_usb_mixer_control/host_usb_mixer_control.vcxproj
+++ b/host_usb_mixer_control/host_usb_mixer_control.vcxproj
@@ -24,7 +24,6 @@
     <ProjectGuid>{84eacf4f-e405-4909-b440-a04a84a3f8c8}</ProjectGuid>
     <RootNamespace>
     </RootNamespace>
-	<SDKPath>C:\Program Files\XMOS\tusbaudiosdk</SDKPath>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -58,8 +57,8 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="Shared">
-    <Import Project="$(SDKPath)\source\tusbaudioapi_inc\tusbaudioapi_inc_vs2019.vcxitems" Label="Shared" />
-    <Import Project="$(SDKPath)\source\libwn_min\_libwn_min_vs2019.vcxitems" Label="Shared" />
+    <Import Project="..\tusbaudioapi_inc\tusbaudioapi_inc_vs2019.vcxitems" Label="Shared" />
+    <Import Project="..\libwn_min\_libwn_min_vs2019.vcxitems" Label="Shared" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -75,12 +74,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>.\bin\$(Configuration)\$(PlatformName)\</OutDir>
+    <OutDir>..\bin\$(Configuration)\$(PlatformName)\</OutDir>
     <IntDir>$(Configuration)\$(PlatformName)_$(PlatformToolset)</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>.\bin\$(Configuration)\$(PlatformName)\</OutDir>
+    <OutDir>..\bin\$(Configuration)\$(PlatformName)\</OutDir>
     <IntDir>$(Configuration)\$(PlatformName)_$(PlatformToolset)</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
@@ -119,7 +118,7 @@
       </SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_AMD64;_CONSOLE;_UNICODE;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>Default</ConformanceMode>
-      <AdditionalIncludeDirectories>.;.\Win;$(SDKPath)\source\shared;$(SDKPath)\source\inc;$(SDKPath)\source\libwn_min;$(SDKPath)\source\libwtl;$(SDKPath)\source\tusbaudioapi_inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;.\Win32;..\shared;..\inc;..\libwn_min;..\libwtl;..\tusbaudioapi_inc</AdditionalIncludeDirectories>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ExceptionHandling>Async</ExceptionHandling>
@@ -146,7 +145,7 @@
       </SDLCheck>
       <PreprocessorDefinitions>_AMD64;_CONSOLE;_UNICODE;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>Default</ConformanceMode>
-      <AdditionalIncludeDirectories>.;.\Win;$(SDKPath)\source\shared;$(SDKPath)\source\inc;$(SDKPath)\source\libwn_min;$(SDKPath)\source\libwtl;$(SDKPath)\source\tusbaudioapi_inc</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;.\Win32;..\shared;..\inc;..\libwn_min;..\libwtl;..\tusbaudioapi_inc</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ExceptionHandling>Async</ExceptionHandling>
       <PrecompiledHeaderFile />
@@ -165,11 +164,11 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="usb_mixer.h" />
-    <ClInclude Include="Win\global.h" />
+    <ClInclude Include="Win32\global.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="mixer_app.cpp" />
-    <ClCompile Include="Win\usb_mixer.cpp" />
+    <ClCompile Include="Win32\usb_mixer.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/host_usb_mixer_control/host_usb_mixer_control.vcxproj.filters b/host_usb_mixer_control/host_usb_mixer_control.vcxproj.filters
index a20e02b1..788254e7 100644
--- a/host_usb_mixer_control/host_usb_mixer_control.vcxproj.filters
+++ b/host_usb_mixer_control/host_usb_mixer_control.vcxproj.filters
@@ -15,18 +15,18 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="usb_mixer.h">
+    <ClInclude Include="Win32\global.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Win\global.h">
+    <ClInclude Include="usb_mixer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="mixer_app.cpp">
+    <ClCompile Include="Win32\usb_mixer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Win\usb_mixer.cpp">
+    <ClCompile Include="mixer_app.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>