From 164eb13806ecc2297f6ee40bd6a3ecc8a044d7fa Mon Sep 17 00:00:00 2001 From: Jessy Diamond Exum Date: Mon, 4 Sep 2017 01:43:54 -0700 Subject: [PATCH] J2534_WIN: Organize Visual Studio projects and build order. --- drivers/windows/.gitignore | 4 + .../panda Driver Package.vcxproj | 65 +-------------- .../panda Test Native.vcxproj | 17 ++-- drivers/windows/panda.sln | 69 +++------------- drivers/windows/panda/panda.vcxproj | 8 ++ drivers/windows/panda/stdafx.h | 2 + .../pandaJ2534DLL/pandaJ2534DLL.vcxproj | 80 ++----------------- .../panda_playground/panda_playground.vcxproj | 19 ++++- drivers/windows/panda_playground/stdafx.h | 2 - 9 files changed, 66 insertions(+), 200 deletions(-) diff --git a/drivers/windows/.gitignore b/drivers/windows/.gitignore index f652b45c..ff4279de 100644 --- a/drivers/windows/.gitignore +++ b/drivers/windows/.gitignore @@ -13,6 +13,10 @@ *.userprefs # Build results +Debug_x86/ +Debug_x64/ +Release_x86/ +Release_x64/ [Dd]ebug/ [Dd]ebugPublic/ [Rr]elease/ diff --git a/drivers/windows/panda Driver Package/panda Driver Package.vcxproj b/drivers/windows/panda Driver Package/panda Driver Package.vcxproj index 787e1a45..5b448e96 100644 --- a/drivers/windows/panda Driver Package/panda Driver Package.vcxproj +++ b/drivers/windows/panda Driver Package/panda Driver Package.vcxproj @@ -9,14 +9,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED} @@ -26,6 +18,7 @@ $driverCurrentWindowsConfigurationName$ Debug Win32 panda_Driver_Package + $(LatestTargetPlatformVersion) @@ -44,22 +37,6 @@ Package true - - Windows10 - true - WindowsKernelModeDriver10.0 - Utility - Package - true - - - WindowsV10.0 - false - WindowsKernelModeDriver10.0 - Utility - Package - true - @@ -79,6 +56,7 @@ True 133563 + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ @@ -91,30 +69,7 @@ True 133563 - - - - DbgengRemoteDebugger - - - - False - False - True - - 133563 - - - - DbgengRemoteDebugger - - - - False - False - True - - 133563 + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ @@ -138,20 +93,6 @@ $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR) - - - - - $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR) - - - - - - - $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR) - - diff --git a/drivers/windows/panda Test Native/panda Test Native.vcxproj b/drivers/windows/panda Test Native/panda Test Native.vcxproj index 95ab463a..ddf3fbba 100644 --- a/drivers/windows/panda Test Native/panda Test Native.vcxproj +++ b/drivers/windows/panda Test Native/panda Test Native.vcxproj @@ -76,29 +76,33 @@ true + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ true + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ true + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ true + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ Use Level3 Disabled - $(SolutionDir);$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) + $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(SolutionDir) WIN32;_DEBUG;%(PreprocessorDefinitions) true Windows $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - $(OutDir)panda.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(OutDir)panda.lib @@ -106,13 +110,14 @@ Use Level3 Disabled - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) + $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(SolutionDir) _DEBUG;%(PreprocessorDefinitions) true Windows $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(OutDir)panda.lib @@ -122,7 +127,7 @@ MaxSpeed true true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) + $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(SolutionDir) WIN32;NDEBUG;%(PreprocessorDefinitions) true @@ -131,6 +136,7 @@ true true $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(OutDir)panda.lib @@ -140,7 +146,7 @@ MaxSpeed true true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) + $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories);$(SolutionDir) NDEBUG;%(PreprocessorDefinitions) true @@ -149,6 +155,7 @@ true true $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(OutDir)panda.lib diff --git a/drivers/windows/panda.sln b/drivers/windows/panda.sln index 931dc947..ddf141a9 100644 --- a/drivers/windows/panda.sln +++ b/drivers/windows/panda.sln @@ -15,101 +15,56 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "panda_playground", "panda_p {5528AEFB-638D-49AF-B9D4-965154E7D531} = {5528AEFB-638D-49AF-B9D4-965154E7D531} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "panda Driver Package", "panda Driver Package\panda Driver Package.vcxproj", "{BD34DB24-F5DC-4992-A74F-05FAF731ABED}" - ProjectSection(ProjectDependencies) = postProject - {5528AEFB-638D-49AF-B9D4-965154E7D531} = {5528AEFB-638D-49AF-B9D4-965154E7D531} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "panda Test", "panda Test Native\panda Test Native.vcxproj", "{99AEA487-44D8-4C32-BFF1-DE426DFBD32F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "panda Test Native", "panda Test Native\panda Test Native.vcxproj", "{99AEA487-44D8-4C32-BFF1-DE426DFBD32F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "panda Driver Package", "panda Driver Package\panda Driver Package.vcxproj", "{BD34DB24-F5DC-4992-A74F-05FAF731ABED}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Debug|ARM.ActiveCfg = Debug|Win32 - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Debug|ARM64.ActiveCfg = Debug|Win32 - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Debug|x64.ActiveCfg = Debug|x64 - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Debug|x64.Build.0 = Debug|x64 + {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Debug|x64.ActiveCfg = Debug|Win32 {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Debug|x86.ActiveCfg = Debug|Win32 {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Debug|x86.Build.0 = Debug|Win32 - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Release|Any CPU.ActiveCfg = Release|Win32 - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Release|ARM.ActiveCfg = Release|Win32 - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Release|ARM64.ActiveCfg = Release|Win32 - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Release|x64.ActiveCfg = Release|x64 - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Release|x64.Build.0 = Release|x64 + {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Release|x64.ActiveCfg = Release|Win32 {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Release|x86.ActiveCfg = Release|Win32 {A2BB18A5-F26B-48D6-BBB5-B83D64473C77}.Release|x86.Build.0 = Release|Win32 - {5528AEFB-638D-49AF-B9D4-965154E7D531}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {5528AEFB-638D-49AF-B9D4-965154E7D531}.Debug|ARM.ActiveCfg = Debug|Win32 - {5528AEFB-638D-49AF-B9D4-965154E7D531}.Debug|ARM64.ActiveCfg = Debug|Win32 {5528AEFB-638D-49AF-B9D4-965154E7D531}.Debug|x64.ActiveCfg = Debug|x64 {5528AEFB-638D-49AF-B9D4-965154E7D531}.Debug|x64.Build.0 = Debug|x64 {5528AEFB-638D-49AF-B9D4-965154E7D531}.Debug|x86.ActiveCfg = Debug|Win32 {5528AEFB-638D-49AF-B9D4-965154E7D531}.Debug|x86.Build.0 = Debug|Win32 - {5528AEFB-638D-49AF-B9D4-965154E7D531}.Release|Any CPU.ActiveCfg = Release|Win32 - {5528AEFB-638D-49AF-B9D4-965154E7D531}.Release|ARM.ActiveCfg = Release|Win32 - {5528AEFB-638D-49AF-B9D4-965154E7D531}.Release|ARM64.ActiveCfg = Release|Win32 {5528AEFB-638D-49AF-B9D4-965154E7D531}.Release|x64.ActiveCfg = Release|x64 {5528AEFB-638D-49AF-B9D4-965154E7D531}.Release|x64.Build.0 = Release|x64 {5528AEFB-638D-49AF-B9D4-965154E7D531}.Release|x86.ActiveCfg = Release|Win32 {5528AEFB-638D-49AF-B9D4-965154E7D531}.Release|x86.Build.0 = Release|Win32 - {691DB635-C272-4B98-897E-0505B970DCA9}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {691DB635-C272-4B98-897E-0505B970DCA9}.Debug|ARM.ActiveCfg = Debug|Win32 - {691DB635-C272-4B98-897E-0505B970DCA9}.Debug|ARM64.ActiveCfg = Debug|Win32 {691DB635-C272-4B98-897E-0505B970DCA9}.Debug|x64.ActiveCfg = Debug|x64 {691DB635-C272-4B98-897E-0505B970DCA9}.Debug|x64.Build.0 = Debug|x64 {691DB635-C272-4B98-897E-0505B970DCA9}.Debug|x86.ActiveCfg = Debug|Win32 {691DB635-C272-4B98-897E-0505B970DCA9}.Debug|x86.Build.0 = Debug|Win32 - {691DB635-C272-4B98-897E-0505B970DCA9}.Release|Any CPU.ActiveCfg = Release|Win32 - {691DB635-C272-4B98-897E-0505B970DCA9}.Release|ARM.ActiveCfg = Release|Win32 - {691DB635-C272-4B98-897E-0505B970DCA9}.Release|ARM64.ActiveCfg = Release|Win32 {691DB635-C272-4B98-897E-0505B970DCA9}.Release|x64.ActiveCfg = Release|x64 {691DB635-C272-4B98-897E-0505B970DCA9}.Release|x64.Build.0 = Release|x64 {691DB635-C272-4B98-897E-0505B970DCA9}.Release|x86.ActiveCfg = Release|Win32 {691DB635-C272-4B98-897E-0505B970DCA9}.Release|x86.Build.0 = Release|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|ARM.ActiveCfg = Debug|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|ARM64.ActiveCfg = Debug|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|x64.ActiveCfg = Debug|x64 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|x64.Build.0 = Debug|x64 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|x64.Deploy.0 = Debug|x64 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|x86.ActiveCfg = Debug|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|x86.Build.0 = Debug|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|x86.Deploy.0 = Debug|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|Any CPU.ActiveCfg = Release|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|ARM.ActiveCfg = Release|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|ARM64.ActiveCfg = Release|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|x64.ActiveCfg = Release|x64 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|x64.Build.0 = Release|x64 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|x64.Deploy.0 = Release|x64 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|x86.ActiveCfg = Release|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|x86.Build.0 = Release|Win32 - {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|x86.Deploy.0 = Release|Win32 - {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Debug|ARM.ActiveCfg = Debug|Win32 - {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Debug|ARM64.ActiveCfg = Debug|Win32 {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Debug|x64.ActiveCfg = Debug|x64 {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Debug|x64.Build.0 = Debug|x64 {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Debug|x86.ActiveCfg = Debug|Win32 {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Debug|x86.Build.0 = Debug|Win32 - {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Release|Any CPU.ActiveCfg = Release|Win32 - {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Release|ARM.ActiveCfg = Release|Win32 - {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Release|ARM64.ActiveCfg = Release|Win32 {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Release|x64.ActiveCfg = Release|x64 {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Release|x64.Build.0 = Release|x64 {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Release|x86.ActiveCfg = Release|Win32 {99AEA487-44D8-4C32-BFF1-DE426DFBD32F}.Release|x86.Build.0 = Release|Win32 + {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|x64.ActiveCfg = Debug|Win32 + {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|x86.ActiveCfg = Debug|Win32 + {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|x86.Build.0 = Debug|Win32 + {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Debug|x86.Deploy.0 = Debug|Win32 + {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|x64.ActiveCfg = Release|Win32 + {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|x86.ActiveCfg = Release|Win32 + {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|x86.Build.0 = Release|Win32 + {BD34DB24-F5DC-4992-A74F-05FAF731ABED}.Release|x86.Deploy.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/drivers/windows/panda/panda.vcxproj b/drivers/windows/panda/panda.vcxproj index 0cb5ce47..645cea99 100644 --- a/drivers/windows/panda/panda.vcxproj +++ b/drivers/windows/panda/panda.vcxproj @@ -71,15 +71,19 @@ true + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ true + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ false + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ false + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ @@ -88,6 +92,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;PANDA_EXPORTS;%(PreprocessorDefinitions) true + false Windows @@ -106,6 +111,7 @@ Windows true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);winusb.lib;setupapi.lib @@ -123,6 +129,7 @@ true true true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);winusb.lib;setupapi.lib @@ -140,6 +147,7 @@ true true true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);winusb.lib;setupapi.lib diff --git a/drivers/windows/panda/stdafx.h b/drivers/windows/panda/stdafx.h index d030e86b..cc3d3b96 100644 --- a/drivers/windows/panda/stdafx.h +++ b/drivers/windows/panda/stdafx.h @@ -7,7 +7,9 @@ #include "targetver.h" +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#endif // Windows Header Files: #include diff --git a/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.vcxproj b/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.vcxproj index 1e010512..cc6ec1b3 100644 --- a/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.vcxproj +++ b/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.vcxproj @@ -9,14 +9,6 @@ Release Win32 - - Debug - x64 - - - Release - x64 - {A2BB18A5-F26B-48D6-BBB5-B83D64473C77} @@ -38,19 +30,6 @@ true Unicode - - DynamicLibrary - true - v140 - Unicode - - - DynamicLibrary - false - v140 - true - Unicode - @@ -62,24 +41,14 @@ - - - - - - true - - - true + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ false - - - false + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ @@ -93,20 +62,7 @@ Windows true - $(OutDir)panda.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Use - Level3 - Disabled - _DEBUG;_WINDOWS;_USRDLL;PANDAJ2534DLL_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(OutDir)panda.lib @@ -118,29 +74,14 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;PANDAJ2534DLL_EXPORTS;%(PreprocessorDefinitions) true + $(SolutionDir); Windows true true true - - - - - Level3 - Use - MaxSpeed - true - true - NDEBUG;_WINDOWS;_USRDLL;PANDAJ2534DLL_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(OutDir)panda.lib @@ -154,25 +95,20 @@ false - false - - false - false - - Create - Create Create - Create + + {bd34db24-f5dc-4992-a74f-05faf731abed} + {5528aefb-638d-49af-b9d4-965154e7d531} diff --git a/drivers/windows/panda_playground/panda_playground.vcxproj b/drivers/windows/panda_playground/panda_playground.vcxproj index 6e63cbc6..3b7a5976 100644 --- a/drivers/windows/panda_playground/panda_playground.vcxproj +++ b/drivers/windows/panda_playground/panda_playground.vcxproj @@ -71,15 +71,19 @@ true + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ true + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ false + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ false + $(SolutionDir)$(Configuration)_$(PlatformShortName)\ @@ -88,12 +92,12 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - $(SolutionDir);%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories);$(SolutionDir) Console true - $(OutDir)panda.lib;%(AdditionalDependencies);winusb.lib;setupapi.lib + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(OutDir)panda.lib @@ -103,10 +107,12 @@ Disabled _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true + %(AdditionalIncludeDirectories);$(SolutionDir) Console true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(OutDir)panda.lib @@ -118,12 +124,14 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true + %(AdditionalIncludeDirectories);$(SolutionDir) Console true true true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(OutDir)panda.lib @@ -135,12 +143,14 @@ true NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true + %(AdditionalIncludeDirectories);$(SolutionDir) Console true true true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);$(OutDir)panda.lib @@ -159,6 +169,11 @@ Create + + + {5528aefb-638d-49af-b9d4-965154e7d531} + + diff --git a/drivers/windows/panda_playground/stdafx.h b/drivers/windows/panda_playground/stdafx.h index 86a17530..f22759b0 100644 --- a/drivers/windows/panda_playground/stdafx.h +++ b/drivers/windows/panda_playground/stdafx.h @@ -15,5 +15,3 @@ #include #include #include -#include -#include