From fa9df079a42996485d3e625e89c61d2ca94894fd Mon Sep 17 00:00:00 2001 From: Christophe Chevalier Date: Thu, 10 Dec 2015 16:23:48 +0100 Subject: [PATCH] Add a Visual Studio project for building zstdlib.dll on Windows - Exports all methods marked with ZSTDLIB_API (ZSTD_DLL_EXPORT=1) - Build without support for legacy version (ZSTD_LEGACY_SUPPORT=0) --- .gitignore | 18 ++ visual/2012/fullbench/fullbench.vcxproj | 14 +- visual/2012/fuzzer/fuzzer.vcxproj | 14 +- visual/2012/zstd.sln | 14 +- visual/2012/zstd/zstd.vcxproj | 10 +- visual/2012/zstdlib/resource.h | Bin 0 -> 812 bytes visual/2012/zstdlib/zstdlib.rc | Bin 0 -> 4610 bytes visual/2012/zstdlib/zstdlib.vcxproj | 216 ++++++++++++++++++++ visual/2012/zstdlib/zstdlib.vcxproj.filters | 80 ++++++++ 9 files changed, 346 insertions(+), 20 deletions(-) create mode 100644 visual/2012/zstdlib/resource.h create mode 100644 visual/2012/zstdlib/zstdlib.rc create mode 100644 visual/2012/zstdlib/zstdlib.vcxproj create mode 100644 visual/2012/zstdlib/zstdlib.vcxproj.filters diff --git a/.gitignore b/.gitignore index c4c9282b..072fe39c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,21 @@ # Visual solution files *.suo *.user + +# Build results +[Dd]ebug/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Bb]in/ +[Oo]bj/ + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile \ No newline at end of file diff --git a/visual/2012/fullbench/fullbench.vcxproj b/visual/2012/fullbench/fullbench.vcxproj index 9a36e5b6..c0d73768 100644 --- a/visual/2012/fullbench/fullbench.vcxproj +++ b/visual/2012/fullbench/fullbench.vcxproj @@ -27,26 +27,26 @@ Application true - v110 + v120 Unicode Application true - v110 + v120 Unicode Application false - v110 + v120 true Unicode Application false - v110 + v120 true Unicode @@ -111,7 +111,7 @@ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true true - /analyze:stacksize19000 %(AdditionalOptions) + /analyze:stacksize25000 %(AdditionalOptions) Console @@ -129,7 +129,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true true - /analyze:stacksize19000 %(AdditionalOptions) + /analyze:stacksize25000 %(AdditionalOptions) Console @@ -149,7 +149,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true true - /analyze:stacksize19000 %(AdditionalOptions) + /analyze:stacksize25000 %(AdditionalOptions) Console diff --git a/visual/2012/fuzzer/fuzzer.vcxproj b/visual/2012/fuzzer/fuzzer.vcxproj index 63ab4720..0844efe7 100644 --- a/visual/2012/fuzzer/fuzzer.vcxproj +++ b/visual/2012/fuzzer/fuzzer.vcxproj @@ -27,26 +27,26 @@ Application true - v110 + v120 Unicode Application true - v110 + v120 Unicode Application false - v110 + v120 true Unicode Application false - v110 + v120 true Unicode @@ -111,7 +111,7 @@ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true true - /analyze:stacksize19000 %(AdditionalOptions) + /analyze:stacksize25000 %(AdditionalOptions) Console @@ -129,7 +129,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true true - /analyze:stacksize19000 %(AdditionalOptions) + /analyze:stacksize25000 %(AdditionalOptions) Console @@ -149,7 +149,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true true - /analyze:stacksize19000 %(AdditionalOptions) + /analyze:stacksize25000 %(AdditionalOptions) Console diff --git a/visual/2012/zstd.sln b/visual/2012/zstd.sln index 2b5eb989..4f2447fb 100644 --- a/visual/2012/zstd.sln +++ b/visual/2012/zstd.sln @@ -1,12 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "zstd\zstd.vcxproj", "{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fuzzer", "fuzzer\fuzzer.vcxproj", "{6FD4352B-346C-4703-96EA-D4A8B9A6976E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench", "fullbench\fullbench.vcxproj", "{61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstdlib", "zstdlib\zstdlib.vcxproj", "{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -39,6 +43,14 @@ Global {61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8}.Release|Win32.Build.0 = Release|Win32 {61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8}.Release|x64.ActiveCfg = Release|x64 {61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8}.Release|x64.Build.0 = Release|x64 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|Win32.ActiveCfg = Debug|Win32 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|Win32.Build.0 = Debug|Win32 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|x64.ActiveCfg = Debug|x64 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Debug|x64.Build.0 = Debug|x64 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|Win32.ActiveCfg = Release|Win32 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|Win32.Build.0 = Release|Win32 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.ActiveCfg = Release|x64 + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/visual/2012/zstd/zstd.vcxproj b/visual/2012/zstd/zstd.vcxproj index 524cf627..2ab12858 100644 --- a/visual/2012/zstd/zstd.vcxproj +++ b/visual/2012/zstd/zstd.vcxproj @@ -63,27 +63,27 @@ Application true - v110 Unicode + v120 Application true - v110 + v120 Unicode Application false - v110 true + v120 Unicode Application false - v110 true + v120 Unicode @@ -104,7 +104,7 @@ true - $(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\legacy;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); true diff --git a/visual/2012/zstdlib/resource.h b/visual/2012/zstdlib/resource.h new file mode 100644 index 0000000000000000000000000000000000000000..db984ef4d6c17963c0691479aa0061d0c8000ffe GIT binary patch literal 812 zcmb7?-Acni5QWdR;5#gMDHsdBKumg3Y*J}V(W_w7Mk=L&{P>Hnu710*5WNVNVY@Ta zGiOdt^7ZM-(>oDsrc9y6y5__#ixp@>mFR;w))81wMv*qkRjE|XDb&zg(5uzzUR$a_ zr-adi*4l9@`VIGr-iA&Ns-;>}7j(8{XT1$6TpfC;S1@nX4frkCCCCbfy&ik-bA$4= zUYsJ!Ua+@i$|`(v+FH7`+gie6oVsW365dDt%fZ$?KFfT<*21YRK>9e8=te0XO`K~J zwl2u7@G5k(-NbHSW)9W|J!5vNJG@W$jdV$8O5W}5p20e1oyvZ8XUvRsi-t^=Ct)Tf z3&=B+_%Nj8=1+`tuF=1l16U)%XInVPYjgp#jlOp<>w%>2Z&2Dx> zMYu_|^4e>A#xwsMJp23Cp6yv=r#7^XO>AsaTHj{OwV0dQgWcF2UnP6P6WPFeHlj_K zpV4=jo6w8yfl-HX#Fw}Y?Vdfm_R?N(%AV`Dm>sct$L_A%n@iE}+O6f>Zc%QzeSJqK z-iLN!b!%AD%64Ms*0xKlFk5DPW;OfBOr7_s9Whg59L|>voA(6iLLb>NxGZDb2c@xn zLH`-(2!{q*U-3Rc>k@hjj|%hqv}KF@+Xi19zMd|L|K=eUB=X+z09Nv(K6+Cw>EKiYKm-gPy z(qOfn6$LHi|G-)0|1RRQV>wtpU{C<7?46O*_z2yPT|N*+G=H-5>$T1$s zW1Tay@_NqFStV!Jc=0t}>ofd9%2g5_tSQk`&)ITWw@V&WCh?ClK~`2tdt0#4X625! zG?Gx?q1O$sdwhz>P2NOwx^s1y6z{|)YaRwRkMa*;KZ(<)?| zCQ*`GA#f*nZtcIyFggj(nbX5gGLq=QInn8dNP8Na*+Nr`CO* zOzsLNXUD#>>N&UynH&<#u(#^30TvpfSr0pnkafHijoI8nR3y1dlRS5l`p>+RalN3) z%1vQ4^eybDN=6vukXsecJ(cFjzTuosk18&5sys-<{KDw&L_`{sDtBT;mn1 zkB4whm2;*b7rFCP@2b{NJ=&qEQqx*zE~~GgLQIL~4z$M(cU5j*){-z8sX?+lwRMqp zKwE`-w&t?Bs`m-KBwWV!hts&r$`G6G;?cr4+p^gw)ZjjFyk(tx>?h9~fPie|Etp($WldvvqL(l*}wjVIk#{Sl>Wm(9{BE{!zPcj%w{Z>(DK@qgoh aWn7BQ8cV{}wd#nRqx&fRC!DssIQ;?sAtTEG literal 0 HcmV?d00001 diff --git a/visual/2012/zstdlib/zstdlib.vcxproj b/visual/2012/zstdlib/zstdlib.vcxproj new file mode 100644 index 00000000..12459555 --- /dev/null +++ b/visual/2012/zstdlib/zstdlib.vcxproj @@ -0,0 +1,216 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {8BFD8150-94D5-4BF9-8A50-7BD9929A0850} + Win32Proj + zstdlib + + + + DynamicLibrary + true + Unicode + v120 + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + false + true + v120 + Unicode + + + DynamicLibrary + false + true + v120 + Unicode + + + + + + + + + + + + + + + + + + + true + zstdlib_x86 + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + true + + + true + zstdlib_x64 + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + true + + + false + zstdlib_x86 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + false + + + false + zstdlib_x64 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + false + + + + + + Level4 + Disabled + ZSTD_DLL_EXPORT=1;ZSTD_HEAPMODE=0;ZSTD_LEGACY_SUPPORT=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + EditAndContinue + true + true + /analyze:stacksize25000 %(AdditionalOptions) + + + Console + true + MachineX86 + + + + + + + Level4 + Disabled + ZSTD_DLL_EXPORT=1;ZSTD_HEAPMODE=0;ZSTD_LEGACY_SUPPORT=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + ProgramDatabase + true + /analyze:stacksize25000 %(AdditionalOptions) + + + Console + true + + + + + Level4 + + + MaxSpeed + true + true + ZSTD_DLL_EXPORT=1;ZSTD_HEAPMODE=0;ZSTD_LEGACY_SUPPORT=0;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + /analyze:stacksize25000 %(AdditionalOptions) + MultiThreadedDLL + ProgramDatabase + All + + + Console + true + true + true + MachineX86 + + + + + Level4 + + + MaxSpeed + true + true + ZSTD_DLL_EXPORT=1;ZSTD_HEAPMODE=0;ZSTD_LEGACY_SUPPORT=0;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + false + MultiThreadedDLL + ProgramDatabase + true + true + All + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/visual/2012/zstdlib/zstdlib.vcxproj.filters b/visual/2012/zstdlib/zstdlib.vcxproj.filters new file mode 100644 index 00000000..9e930d7b --- /dev/null +++ b/visual/2012/zstdlib/zstdlib.vcxproj.filters @@ -0,0 +1,80 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {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 + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file