# HG changeset patch # User Christian Taedcke <hacking@taedcke.com> # Date 1337672019 -7200 # Node ID d1f47159c1a42a130281818175fff09579339ece # Parent c4793e10e04f2b1a9c9a1acce6bbc4960021b8e9 can_peak_win32 project files: - adapted VS2008 project file - added lib file and include directory to releas config of VS2010 project diff -r c4793e10e04f -r d1f47159c1a4 drivers/can_peak_win32/can_peak_win32.vc10.vcxproj --- a/drivers/can_peak_win32/can_peak_win32.vc10.vcxproj Tue May 22 09:17:19 2012 +0200 +++ b/drivers/can_peak_win32/can_peak_win32.vc10.vcxproj Tue May 22 09:33:39 2012 +0200 @@ -99,12 +99,12 @@ </DataExecutionPrevention> <ImportLibrary>$(OutDir)can_peak_win32.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> - <AdditionalDependencies>D:\myProjects\PCAN-Light API\Win32\VC_LIB\PCAN_USB.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>D:\myProjects\PCAN-Light API\Win32\VC_LIB\PCAN_USB.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>../../include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include;../../include/win32;D:\myProjects/PCAN-Light API/Include/C++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CANpeak_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -124,11 +124,12 @@ </DataExecutionPrevention> <ImportLibrary>$(OutDir)can_peak_win32.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>D:\myProjects\PCAN-Light API\Win32\VC_LIB\PCAN_USB.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release UNICODE|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>../../include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include;../../include/win32;D:\myProjects/PCAN-Light API/Include/C++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CANpeak_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -148,12 +149,13 @@ </DataExecutionPrevention> <ImportLibrary>$(OutDir)can_peak_win32.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>D:\myProjects\PCAN-Light API\Win32\VC_LIB\PCAN_USB.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug UNICODE|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../include;../../include/win32;D:\myProjects/PCAN-Light API/Include/C++;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CANpeak_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -174,6 +176,7 @@ </DataExecutionPrevention> <ImportLibrary>$(OutDir)can_peak_win32.lib</ImportLibrary> <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>D:\myProjects\PCAN-Light API\Win32\VC_LIB\PCAN_USB.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff -r c4793e10e04f -r d1f47159c1a4 drivers/can_peak_win32/can_peak_win32.vc9.vcproj --- a/drivers/can_peak_win32/can_peak_win32.vc9.vcproj Tue May 22 09:17:19 2012 +0200 +++ b/drivers/can_peak_win32/can_peak_win32.vc9.vcproj Tue May 22 09:33:39 2012 +0200 @@ -4,6 +4,7 @@ Version="9,00" Name="can_peak_win32" ProjectGUID="{732EC5B6-C6F1-4783-9BC8-924FFF67BF5A}" + RootNamespace="can_peak_win32" Keyword="Win32Proj" TargetFrameworkVersion="131072" > @@ -41,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../include;../../include/win32" + AdditionalIncludeDirectories="../../include;../../include/win32;"D:\myProjects\PCAN-Light API\Include\C++"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CANpeak_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -62,6 +63,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="D:/myProjects/PCAN-Light API/Win32/PCAN_USB.dll" OutputFile="$(OutDir)/can_peak_win32.dll" LinkIncremental="2" ModuleDefinitionFile="can_peak_win32.def" @@ -121,7 +123,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../include;../../include/win32" + AdditionalIncludeDirectories="../../include;../../include/win32;"D:\myProjects\PCAN-Light API\Include\C++"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CANpeak_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -140,6 +142,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="D:/myProjects/PCAN-Light API/Win32/PCAN_USB.dll" OutputFile="$(OutDir)/can_peak_win32.dll" LinkIncremental="1" ModuleDefinitionFile="can_peak_win32.def" @@ -200,7 +203,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="../../include;../../include/win32" + AdditionalIncludeDirectories="../../include;../../include/win32;"D:\myProjects\PCAN-Light API\Include\C++"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CANpeak_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -219,6 +222,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="D:/myProjects/PCAN-Light API/Win32/PCAN_USB.dll" OutputFile="$(OutDir)/can_peak_win32.dll" LinkIncremental="1" ModuleDefinitionFile="can_peak_win32.def" @@ -280,7 +284,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../include;../../include/win32" + AdditionalIncludeDirectories="../../include;../../include/win32;"D:\myProjects\PCAN-Light API\Include\C++"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CANpeak_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -301,6 +305,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalDependencies="D:/myProjects/PCAN-Light API/Win32/PCAN_USB.dll" OutputFile="$(OutDir)/can_peak_win32.dll" LinkIncremental="2" ModuleDefinitionFile="can_peak_win32.def" @@ -369,14 +374,6 @@ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > </Filter> - <File - RelativePath="..\..\..\..\PC-Card\Lib\Visual C++\Pcan_2pcc.lib" - > - </File> - <File - RelativePath="..\..\..\..\PC-Card\Lib\Visual C++\Pcan_pcc.lib" - > - </File> </Files> <Globals> </Globals>