From 2007464274a0151c61801d3971cf53a6edddf15c Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Tue, 15 Nov 2016 16:32:26 +0100 Subject: [PATCH] removed _x64 and _x86 --- visual/VS2010/fullbench-dll/fullbench-dll.vcxproj | 8 ++++---- visual/VS2010/liblz4-dll/{lz4-dll.rc => liblz4-dll.rc} | 0 .../liblz4-dll/{lz4-dll.vcxproj => liblz4-dll.vcxproj} | 10 +++++----- visual/VS2010/liblz4/liblz4.vcxproj | 8 ++++---- visual/VS2010/lz4.sln | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) rename visual/VS2010/liblz4-dll/{lz4-dll.rc => liblz4-dll.rc} (100%) rename visual/VS2010/liblz4-dll/{lz4-dll.vcxproj => liblz4-dll.vcxproj} (97%) diff --git a/visual/VS2010/fullbench-dll/fullbench-dll.vcxproj b/visual/VS2010/fullbench-dll/fullbench-dll.vcxproj index c25e41c..cb9ece6 100644 --- a/visual/VS2010/fullbench-dll/fullbench-dll.vcxproj +++ b/visual/VS2010/fullbench-dll/fullbench-dll.vcxproj @@ -96,7 +96,7 @@ Console true $(SolutionDir)bin\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) - lz4_x86.lib;%(AdditionalDependencies) + liblz4.lib;%(AdditionalDependencies) @@ -114,7 +114,7 @@ Console true $(SolutionDir)bin\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) - lz4_x64.lib;%(AdditionalDependencies) + liblz4.lib;%(AdditionalDependencies) @@ -135,7 +135,7 @@ true true $(SolutionDir)bin\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) - lz4_x86.lib;%(AdditionalDependencies) + liblz4.lib;%(AdditionalDependencies) @@ -157,7 +157,7 @@ true true $(SolutionDir)bin\$(Platform)_$(Configuration);%(AdditionalLibraryDirectories) - lz4_x64.lib;%(AdditionalDependencies) + liblz4.lib;%(AdditionalDependencies) diff --git a/visual/VS2010/liblz4-dll/lz4-dll.rc b/visual/VS2010/liblz4-dll/liblz4-dll.rc similarity index 100% rename from visual/VS2010/liblz4-dll/lz4-dll.rc rename to visual/VS2010/liblz4-dll/liblz4-dll.rc diff --git a/visual/VS2010/liblz4-dll/lz4-dll.vcxproj b/visual/VS2010/liblz4-dll/liblz4-dll.vcxproj similarity index 97% rename from visual/VS2010/liblz4-dll/lz4-dll.vcxproj rename to visual/VS2010/liblz4-dll/liblz4-dll.vcxproj index ac17287..95dcbdd 100644 --- a/visual/VS2010/liblz4-dll/lz4-dll.vcxproj +++ b/visual/VS2010/liblz4-dll/liblz4-dll.vcxproj @@ -67,23 +67,23 @@ true - lz4_x86 + liblz4 $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); true - lz4_x64 + liblz4 $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); true false - lz4_x86 + liblz4 $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); false - lz4_x64 + liblz4 $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); true @@ -167,7 +167,7 @@ - + diff --git a/visual/VS2010/liblz4/liblz4.vcxproj b/visual/VS2010/liblz4/liblz4.vcxproj index bafc998..a0b8000 100644 --- a/visual/VS2010/liblz4/liblz4.vcxproj +++ b/visual/VS2010/liblz4/liblz4.vcxproj @@ -66,23 +66,23 @@ true - liblz4_x86 + liblz4_static $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); true - liblz4_x64 + liblz4_static $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); true false - liblz4_x86 + liblz4_static $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); false - liblz4_x64 + liblz4_static $(IncludePath);$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); true diff --git a/visual/VS2010/lz4.sln b/visual/VS2010/lz4.sln index d3725ae..78f223b 100644 --- a/visual/VS2010/lz4.sln +++ b/visual/VS2010/lz4.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2012 for Windows Desktop Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lz4", "lz4\lz4.vcxproj", "{E30329AC-0057-4FE0-8FDA-7F650D398C4C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblz4-dll", "liblz4-dll\lz4-dll.vcxproj", "{9800039D-4AAA-43A4-BB78-FEF6F4836927}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblz4-dll", "liblz4-dll\liblz4-dll.vcxproj", "{9800039D-4AAA-43A4-BB78-FEF6F4836927}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblz4", "liblz4\liblz4.vcxproj", "{9092C5CC-3E71-41B3-BF68-4A7BDD8A5476}" EndProject