From 7c4d041d3cb94d96c6a4aa3bff88f8b99103b879 Mon Sep 17 00:00:00 2001 From: inikep Date: Mon, 16 May 2016 14:48:04 +0200 Subject: [PATCH] added Visual Studio 2008 and 2010 projects --- appveyor.yml | 55 +- projects/README.md | 8 + projects/VS2008/fullbench/fullbench.vcproj | 441 +++++++++++++++ projects/VS2008/fuzzer/fuzzer.vcproj | 437 ++++++++++++++ projects/VS2008/zstd.sln | 56 ++ projects/VS2008/zstd/zstd.vcproj | 533 ++++++++++++++++++ projects/VS2008/zstdlib/zstdlib.vcproj | 487 ++++++++++++++++ .../VS2010}/fullbench/fullbench.vcxproj | 18 +- .../fullbench/fullbench.vcxproj.filters | 0 .../VS2010}/fuzzer/fuzzer.vcxproj | 18 +- .../VS2010}/fuzzer/fuzzer.vcxproj.filters | 0 {visual/2013 => projects/VS2010}/zstd.sln | 0 .../VS2010}/zstd/zstd.vcxproj | 30 +- .../VS2010}/zstd/zstd.vcxproj.filters | 0 .../VS2010}/zstdlib/zstdlib.vcxproj | 17 +- .../VS2010}/zstdlib/zstdlib.vcxproj.filters | 9 - visual/2013/zstdlib/resource.h | Bin 812 -> 0 bytes visual/2013/zstdlib/zstdlib.rc | Bin 5196 -> 0 bytes 18 files changed, 2040 insertions(+), 69 deletions(-) create mode 100644 projects/README.md create mode 100644 projects/VS2008/fullbench/fullbench.vcproj create mode 100644 projects/VS2008/fuzzer/fuzzer.vcproj create mode 100644 projects/VS2008/zstd.sln create mode 100644 projects/VS2008/zstd/zstd.vcproj create mode 100644 projects/VS2008/zstdlib/zstdlib.vcproj rename {visual/2013 => projects/VS2010}/fullbench/fullbench.vcxproj (88%) rename {visual/2013 => projects/VS2010}/fullbench/fullbench.vcxproj.filters (100%) rename {visual/2013 => projects/VS2010}/fuzzer/fuzzer.vcxproj (88%) rename {visual/2013 => projects/VS2010}/fuzzer/fuzzer.vcxproj.filters (100%) rename {visual/2013 => projects/VS2010}/zstd.sln (100%) rename {visual/2013 => projects/VS2010}/zstd/zstd.vcxproj (85%) mode change 100755 => 100644 rename {visual/2013 => projects/VS2010}/zstd/zstd.vcxproj.filters (100%) mode change 100755 => 100644 rename {visual/2013 => projects/VS2010}/zstdlib/zstdlib.vcxproj (88%) rename {visual/2013 => projects/VS2010}/zstdlib/zstdlib.vcxproj.filters (90%) delete mode 100644 visual/2013/zstdlib/resource.h delete mode 100644 visual/2013/zstdlib/zstdlib.rc diff --git a/appveyor.yml b/appveyor.yml index df8d15572..848db3836 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,21 +5,46 @@ configuration: platform: - Win32 - x64 -environment: - matrix: -# - PlatformToolset: v100 - - PlatformToolset: v110 - - PlatformToolset: v120 - - PlatformToolset: v140 + build_script: -- cmd: >- - ECHO PlatformToolset=%PlatformToolset% +- cmd: | + ECHO *** + ECHO *** Building Visual Studio 2008 %PLATFORM%\%CONFIGURATION% + ECHO *** + msbuild "projects\VS2008\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v90 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + COPY projects\VS2008\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe projects\fuzzer_VS2008_%PLATFORM%_%CONFIGURATION%.exe + + ECHO *** + ECHO *** Building Visual Studio 2010 %PLATFORM%\%CONFIGURATION% + ECHO *** + REM msbuild "projects\VS2010\zstd.sln" /m /verbosity:detailed /property:PlatformToolset=Windows7.1SDK /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + REM msbuild "projects\VS2010\zstd.sln" "/p:AdditionalLibPaths=C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib\X64" /m /verbosity:detailed /property:PlatformToolset=v100 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + msbuild "projects\VS2010\zstd.sln" /p:LibraryPath="C:\Program Files\Microsoft SDKs\Windows\v7.1\lib\x64;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\Program Files (x86)\Microsoft Visual Studio 10.0\;C:\Program Files (x86)\Microsoft Visual Studio 10.0\lib\amd64;" /m /verbosity:normal /property:PlatformToolset=v100 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe projects\fuzzer_VS2010_%PLATFORM%_%CONFIGURATION%.exe + + ECHO *** + ECHO *** Building Visual Studio 2012 %PLATFORM%\%CONFIGURATION% + ECHO *** + msbuild "projects\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v110 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe projects\fuzzer_VS2012_%PLATFORM%_%CONFIGURATION%.exe + + ECHO *** + ECHO *** Building Visual Studio 2013 %PLATFORM%\%CONFIGURATION% + ECHO *** + msbuild "projects\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v120 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe projects\fuzzer_VS2013_%PLATFORM%_%CONFIGURATION%.exe + + ECHO *** + ECHO *** Building Visual Studio 2015 %PLATFORM%\%CONFIGURATION% + ECHO *** + msbuild "projects\VS2010\zstd.sln" /m /verbosity:normal /property:PlatformToolset=v140 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe projects\fuzzer_VS2015_%PLATFORM%_%CONFIGURATION%.exe - msbuild "visual\2013\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=%PlatformToolset% /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" test_script: -- cmd: >- - ECHO %APPVEYOR_BUILD_FOLDER%\visual\2013\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe %FUZZERTEST% - - SET FUZZERTEST=-T2mn - - IF %CONFIGURATION%==Release (%APPVEYOR_BUILD_FOLDER%\visual\2013\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe %FUZZERTEST%) \ No newline at end of file +- cmd: SET FUZZERTEST=-T1mn +- cmd: | + IF %CONFIGURATION%==Release (projects\fuzzer_VS2008_%PLATFORM%_Release.exe %FUZZERTEST%) + IF %CONFIGURATION%==Release (projects\fuzzer_VS2010_%PLATFORM%_Release.exe %FUZZERTEST%) + IF %CONFIGURATION%==Release (projects\fuzzer_VS2012_%PLATFORM%_Release.exe %FUZZERTEST%) + IF %CONFIGURATION%==Release (projects\fuzzer_VS2013_%PLATFORM%_Release.exe %FUZZERTEST%) + IF %CONFIGURATION%==Release (projects\fuzzer_VS2015_%PLATFORM%_Release.exe %FUZZERTEST%) diff --git a/projects/README.md b/projects/README.md new file mode 100644 index 000000000..d69c71b14 --- /dev/null +++ b/projects/README.md @@ -0,0 +1,8 @@ +projects for various integrated development environments (IDE) +================================ + +#### Included projects + +The following projects are included with the zstd distribution: +- VS2008 - Visual Studio 2008 project +- VS2010 - Visual Studio 2010 project (which also works well with Visual Studio 2012, 2013, 2015) diff --git a/projects/VS2008/fullbench/fullbench.vcproj b/projects/VS2008/fullbench/fullbench.vcproj new file mode 100644 index 000000000..6ab878cc9 --- /dev/null +++ b/projects/VS2008/fullbench/fullbench.vcproj @@ -0,0 +1,441 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/VS2008/fuzzer/fuzzer.vcproj b/projects/VS2008/fuzzer/fuzzer.vcproj new file mode 100644 index 000000000..9e572da26 --- /dev/null +++ b/projects/VS2008/fuzzer/fuzzer.vcproj @@ -0,0 +1,437 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/VS2008/zstd.sln b/projects/VS2008/zstd.sln new file mode 100644 index 000000000..97b88c8d0 --- /dev/null +++ b/projects/VS2008/zstd.sln @@ -0,0 +1,56 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "zstd\zstd.vcproj", "{1A2AB08E-5CE7-4C5B-BE55-458157C14051}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fuzzer", "fuzzer\fuzzer.vcproj", "{A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench", "fullbench\fullbench.vcproj", "{CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstdlib", "zstdlib\zstdlib.vcproj", "{99DE2A79-7298-4004-A0ED-030D7A3796CA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|Win32.ActiveCfg = Debug|Win32 + {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|Win32.Build.0 = Debug|Win32 + {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|x64.ActiveCfg = Debug|x64 + {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|x64.Build.0 = Debug|x64 + {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|Win32.ActiveCfg = Release|Win32 + {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|Win32.Build.0 = Release|Win32 + {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|x64.ActiveCfg = Release|x64 + {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|x64.Build.0 = Release|x64 + {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|Win32.Build.0 = Debug|Win32 + {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|x64.ActiveCfg = Debug|x64 + {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|x64.Build.0 = Debug|x64 + {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|Win32.ActiveCfg = Release|Win32 + {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|Win32.Build.0 = Release|Win32 + {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|x64.ActiveCfg = Release|x64 + {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|x64.Build.0 = Release|x64 + {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|Win32.ActiveCfg = Debug|Win32 + {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|Win32.Build.0 = Debug|Win32 + {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|x64.ActiveCfg = Debug|x64 + {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|x64.Build.0 = Debug|x64 + {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|Win32.ActiveCfg = Release|Win32 + {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|Win32.Build.0 = Release|Win32 + {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|x64.ActiveCfg = Release|x64 + {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|x64.Build.0 = Release|x64 + {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|Win32.ActiveCfg = Debug|Win32 + {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|Win32.Build.0 = Debug|Win32 + {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|x64.ActiveCfg = Debug|x64 + {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|x64.Build.0 = Debug|x64 + {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|Win32.ActiveCfg = Release|Win32 + {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|Win32.Build.0 = Release|Win32 + {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|x64.ActiveCfg = Release|x64 + {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/projects/VS2008/zstd/zstd.vcproj b/projects/VS2008/zstd/zstd.vcproj new file mode 100644 index 000000000..9e4626500 --- /dev/null +++ b/projects/VS2008/zstd/zstd.vcproj @@ -0,0 +1,533 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/projects/VS2008/zstdlib/zstdlib.vcproj b/projects/VS2008/zstdlib/zstdlib.vcproj new file mode 100644 index 000000000..2a4779aac --- /dev/null +++ b/projects/VS2008/zstdlib/zstdlib.vcproj @@ -0,0 +1,487 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/visual/2013/fullbench/fullbench.vcxproj b/projects/VS2010/fullbench/fullbench.vcxproj similarity index 88% rename from visual/2013/fullbench/fullbench.vcxproj rename to projects/VS2010/fullbench/fullbench.vcxproj index 40935bbf7..2d9b78ce1 100644 --- a/visual/2013/fullbench/fullbench.vcxproj +++ b/projects/VS2010/fullbench/fullbench.vcxproj @@ -29,25 +29,21 @@ Application true MultiByte - v110 Application true - v110 MultiByte Application false - v110 true MultiByte Application false - v110 true MultiByte @@ -69,22 +65,24 @@ true - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath) + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false + $(Platform)\$(Configuration)\ true - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath) + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false false - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath) + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false + $(Platform)\$(Configuration)\ false - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath) + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false @@ -127,7 +125,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) false - true + false MultiThreaded @@ -146,7 +144,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true + false false MultiThreaded diff --git a/visual/2013/fullbench/fullbench.vcxproj.filters b/projects/VS2010/fullbench/fullbench.vcxproj.filters similarity index 100% rename from visual/2013/fullbench/fullbench.vcxproj.filters rename to projects/VS2010/fullbench/fullbench.vcxproj.filters diff --git a/visual/2013/fuzzer/fuzzer.vcxproj b/projects/VS2010/fuzzer/fuzzer.vcxproj similarity index 88% rename from visual/2013/fuzzer/fuzzer.vcxproj rename to projects/VS2010/fuzzer/fuzzer.vcxproj index bd3e849f4..047d5fd55 100644 --- a/visual/2013/fuzzer/fuzzer.vcxproj +++ b/projects/VS2010/fuzzer/fuzzer.vcxproj @@ -28,26 +28,22 @@ Application true - v110 MultiByte Application true - v110 MultiByte Application false - v110 true MultiByte Application false - v110 true MultiByte @@ -69,23 +65,25 @@ true - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath) false + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); + $(Platform)\$(Configuration)\ true - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath) false + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath) false + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); + $(Platform)\$(Configuration)\ false - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath) false + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); @@ -127,7 +125,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) false - true + false MultiThreaded @@ -146,7 +144,7 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true + false false MultiThreaded diff --git a/visual/2013/fuzzer/fuzzer.vcxproj.filters b/projects/VS2010/fuzzer/fuzzer.vcxproj.filters similarity index 100% rename from visual/2013/fuzzer/fuzzer.vcxproj.filters rename to projects/VS2010/fuzzer/fuzzer.vcxproj.filters diff --git a/visual/2013/zstd.sln b/projects/VS2010/zstd.sln similarity index 100% rename from visual/2013/zstd.sln rename to projects/VS2010/zstd.sln diff --git a/visual/2013/zstd/zstd.vcxproj b/projects/VS2010/zstd/zstd.vcxproj old mode 100755 new mode 100644 similarity index 85% rename from visual/2013/zstd/zstd.vcxproj rename to projects/VS2010/zstd/zstd.vcxproj index d6f7edd66..8fff6320d --- a/visual/2013/zstd/zstd.vcxproj +++ b/projects/VS2010/zstd/zstd.vcxproj @@ -82,27 +82,23 @@ Application true - v110 MultiByte Application true - v110 MultiByte Application false true - v110 MultiByte Application false true - v110 MultiByte @@ -123,23 +119,29 @@ true - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false + $(LibraryPath) + $(Platform)\$(Configuration)\ true - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false + $(LibraryPath); false - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false + $(LibraryPath) + $(Platform)\$(Configuration)\ false - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false + $(LibraryPath); @@ -154,6 +156,7 @@ Console true + setargv.obj;%(AdditionalDependencies) @@ -163,12 +166,13 @@ Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - false + true false Console true + setargv.obj;%(AdditionalDependencies) @@ -176,12 +180,12 @@ Level4 - Full + MaxSpeed true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) false - true + false MultiThreaded @@ -189,7 +193,7 @@ true true true - setargv.obj; 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) + setargv.obj;%(AdditionalDependencies) @@ -210,7 +214,7 @@ true true true - setargv.obj;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) + setargv.obj;%(AdditionalDependencies) diff --git a/visual/2013/zstd/zstd.vcxproj.filters b/projects/VS2010/zstd/zstd.vcxproj.filters old mode 100755 new mode 100644 similarity index 100% rename from visual/2013/zstd/zstd.vcxproj.filters rename to projects/VS2010/zstd/zstd.vcxproj.filters diff --git a/visual/2013/zstdlib/zstdlib.vcxproj b/projects/VS2010/zstdlib/zstdlib.vcxproj similarity index 88% rename from visual/2013/zstdlib/zstdlib.vcxproj rename to projects/VS2010/zstdlib/zstdlib.vcxproj index c13ff0af0..e8625a501 100644 --- a/visual/2013/zstdlib/zstdlib.vcxproj +++ b/projects/VS2010/zstdlib/zstdlib.vcxproj @@ -48,9 +48,6 @@ - - - {8BFD8150-94D5-4BF9-8A50-7BD9929A0850} Win32Proj @@ -61,27 +58,23 @@ DynamicLibrary true - v110 MultiByte DynamicLibrary true - v110 MultiByte DynamicLibrary false true - v110 MultiByte DynamicLibrary false true - v110 MultiByte @@ -104,28 +97,28 @@ true zstdlib_x86 $(Platform)\$(Configuration)\ - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false true zstdlib_x64 $(Platform)\$(Configuration)\ - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false false zstdlib_x86 $(Platform)\$(Configuration)\ - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false false zstdlib_x64 $(Platform)\$(Configuration)\ - $(WindowsSdkDir)\include;$(UniversalCRT_IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); false @@ -155,7 +148,7 @@ Level4 Disabled ZSTD_DLL_EXPORT=1;ZSTD_HEAPMODE=0;ZSTD_LEGACY_SUPPORT=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false + true EnableFastChecks MultiThreadedDebugDLL ProgramDatabase diff --git a/visual/2013/zstdlib/zstdlib.vcxproj.filters b/projects/VS2010/zstdlib/zstdlib.vcxproj.filters similarity index 90% rename from visual/2013/zstdlib/zstdlib.vcxproj.filters rename to projects/VS2010/zstdlib/zstdlib.vcxproj.filters index 327f3a26e..e4bebb546 100644 --- a/visual/2013/zstdlib/zstdlib.vcxproj.filters +++ b/projects/VS2010/zstdlib/zstdlib.vcxproj.filters @@ -9,10 +9,6 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - @@ -102,9 +98,4 @@ Header Files - - - Resource Files - - \ No newline at end of file diff --git a/visual/2013/zstdlib/resource.h b/visual/2013/zstdlib/resource.h deleted file mode 100644 index db984ef4d6c17963c0691479aa0061d0c8000ffe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 812 zcmezWPoF`bp_-wZ!H>b8A)dj7!IdF^!Ii-e%<^M!X7FTiWe8@dWvFG~W#D1}sa9a{ zWyoYmW+-CFXDDXKXGmixVNhTQW5{GEW+-JyWXNGqU~p#8X3%C(U`S_3WyoVlWhi1u zWGG=sWk_LAV8~?1V@PJmVJKxtVMt|AU`S)gWXNGiWza*iA(WvQsyd0Gl0ku?ilLaH zgdv3?har<8i9wH{h#?uS8sshzhPcg-A(f#5>>`lqX$*-Br3^V>ei_(pr3|SI#b8_W z8HyMbz^*H2P+-VsNMguhNM%T7C}Ajuo2>w5DKlg;q=8+V#-PC9$PmB~%n-s5%HYD_ z2@W++20w-{27d-`23H0bBprEp^aL@uGB`50F!(e0G59bf!r;l^&k)ZL#Nf){$l$`@&)~=4!w|_3&k)QI$>7W2#Nf~1!w?L%59G?h zi9vn@xeP`tFt}rhi8OE=<}xTSlrUs~LpOxMl_7#5gu#=+kHMM22OJ)*3Q($ld=O<7e%V1Do z&;auj!Feu~K@&@?7lTtiNIxjIfx<@-8d9K~3d-Rc42}$L3=z;g6wKhy5Xun5;LPC4 z5YOPk;KSepHn)bMhCu+a|Neb4+b3u1%_aTPzEOk?D8PjgD}JgkdgpfJcDvU7=u59H-jsK3)lsqup68h zZT7dxqv6sRz3a_O(cfLW?2F~l$wF~l(BL2ZY)QGo#@j@?DZWcr#^dz8VYZVE#t z11P6J+y#my;!+zZ>_8Z#V{l@a>tHmf9RRBBiy1N*@)`0NVB#Pegq2ZpyaGcMxMYZD z@L}*|aAJsO2xD+%2x15Z*TH@aAbC)&?1CW^&*018$l%4`&k)3*!w?0oyRoYRb^LHrQmb+W`wJ?4b#2!GtgbfkPEk9>;_0di<_|xdFS0kWv}smN153EO7)1dp8Du zaO)5`USZ-OouC@XlK~X^m~jtrC3d?ZdIK1O82lMr7(yAG8A7n69>ONLF+gm01J@Pq z48h=(70lqxpuk|jP{Cl#kjCHxPRF3qC=Hr^6~J|wD}xh5D1$p#7U2(sNe~kZ;rde< zau|vkQVFOxKvEBCg@DQqh;LzT^=Al%y3T~b01Qo_dJwJ%VTfc10N0TqUl?J?L+VFV zRWO^em-(RD)Stl_95PA_!3-q~Md0>bI)fWSCPNNGDuX9O9zz;KK3XY^-84v9r~s~` z5vCe2fP9q90HTxNwFyiujK*&wOjQ_zBe(?%Y9}Z$I5XrkXHkz+)50`4m)QLdqdfDl!D8 z4+Cha4RJ5RwFnj{Z{Tk4k=M@}oUJ~Pt3bX*#*o?(R9}HgG~(K~Aae#M2Kfx+G8j$i r_=z!=o;2$C3CJc82H83|G01he({~<2K6o4ubF>81+C%L{gG>Sd7At^m