diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-04-15 21:25:39 +0000 | 
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2017-04-15 21:25:39 +0000 | 
| commit | 6e75c93f2f94ac9c5c33f61f9963f2fa2e400b15 (patch) | |
| tree | 9e8ad890edb9a7fb76427cd99e5a24e24d5d02af /lib/dll/example | |
| parent | a19eddc34b6e8db043dbf6180c90e9bbe531dc03 (diff) | |
Notes
Diffstat (limited to 'lib/dll/example')
| -rw-r--r-- | lib/dll/example/Makefile | 47 | ||||
| -rw-r--r-- | lib/dll/example/README.md | 69 | ||||
| -rw-r--r-- | lib/dll/example/build_package.bat | 18 | ||||
| -rw-r--r-- | lib/dll/example/fullbench-dll.sln | 25 | ||||
| -rw-r--r-- | lib/dll/example/fullbench-dll.vcxproj | 181 | 
5 files changed, 0 insertions, 340 deletions
diff --git a/lib/dll/example/Makefile b/lib/dll/example/Makefile deleted file mode 100644 index 36041a0e300e..000000000000 --- a/lib/dll/example/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# ########################################################################## -# Copyright (c) 2016-present, Yann Collet, Facebook, Inc. -# All rights reserved. -# -# This source code is licensed under the BSD-style license found in the -# LICENSE file in the root directory of this source tree. An additional grant -# of patent rights can be found in the PATENTS file in the same directory. -# ########################################################################## - -VOID    := /dev/null -ZSTDDIR  := ../include -LIBDIR  := ../static -DLLDIR  := ../dll - -CFLAGS  ?= -O3   # can select custom flags. For example : CFLAGS="-O2 -g" make -CFLAGS  += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum \ -           -Wdeclaration-after-statement -Wstrict-prototypes \ -           -Wpointer-arith -Wstrict-aliasing=1 -CFLAGS  += $(MOREFLAGS) -CPPFLAGS:= -I$(ZSTDDIR) -DXXH_NAMESPACE=ZSTD_ -FLAGS   := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) - - -# Define *.exe as extension for Windows systems -ifneq (,$(filter Windows%,$(OS))) -EXT =.exe -else -EXT = -endif - -.PHONY: default fullbench-dll fullbench-lib - - -default: all - -all: fullbench-dll fullbench-lib - - -fullbench-lib: fullbench.c datagen.c -	$(CC) $(FLAGS) $^ -o $@$(EXT) $(LIBDIR)/libzstd_static.lib - -fullbench-dll: fullbench.c datagen.c -	$(CC) $(FLAGS) $^ -o $@$(EXT) -DZSTD_DLL_IMPORT=1 $(DLLDIR)/libzstd.dll - -clean: -	@$(RM) fullbench-dll$(EXT) fullbench-lib$(EXT) \ -	@echo Cleaning completed diff --git a/lib/dll/example/README.md b/lib/dll/example/README.md deleted file mode 100644 index 957a29f3560f..000000000000 --- a/lib/dll/example/README.md +++ /dev/null @@ -1,69 +0,0 @@ -ZSTD Windows binary package -==================================== - -#### The package contents - -- `zstd.exe`                  : Command Line Utility, supporting gzip-like arguments -- `dll\libzstd.dll`           : The DLL of ZSTD library -- `dll\libzstd.lib`           : The import library of ZSTD library for Visual C++ -- `example\`                  : The example of usage of ZSTD library -- `include\`                  : Header files required with ZSTD library -- `static\libzstd_static.lib` : The static ZSTD library - - -#### Usage of Command Line Interface - -Command Line Interface (CLI) supports gzip-like arguments. -By default CLI takes an input file and compresses it to an output file: -``` -    Usage: zstd [arg] [input] [output] -``` -The full list of commands for CLI can be obtained with `-h` or `-H`. The ratio can -be improved with commands from `-3` to `-16` but higher levels also have slower -compression. CLI includes in-memory compression benchmark module with compression -levels starting from `-b` and ending with `-e` with iteration time of `-i` seconds. -CLI supports aggregation of parameters i.e. `-b1`, `-e18`, and `-i1` can be joined -into `-b1e18i1`. - - -#### The example of usage of static and dynamic ZSTD libraries with gcc/MinGW - -Use `cd example` and `make` to build `fullbench-dll` and `fullbench-lib`. -`fullbench-dll` uses a dynamic ZSTD library from the `dll` directory. -`fullbench-lib` uses a static ZSTD library from the `lib` directory. - - -#### Using ZSTD DLL with gcc/MinGW - -The header files from `include\` and the dynamic library `dll\libzstd.dll` -are required to compile a project using gcc/MinGW. -The dynamic library has to be added to linking options. -It means that if a project that uses ZSTD consists of a single `test-dll.c` -file it should be linked with `dll\libzstd.dll`. For example: -``` -    gcc $(CFLAGS) -Iinclude\ test-dll.c -o test-dll dll\libzstd.dll -``` -The compiled executable will require ZSTD DLL which is available at `dll\libzstd.dll`. - - -#### The example of usage of static and dynamic ZSTD libraries with Visual C++ - -Open `example\fullbench-dll.sln` to compile `fullbench-dll` that uses a -dynamic ZSTD library from the `dll` directory. The solution works with Visual C++ -2010 or newer. When one will open the solution with Visual C++ newer than 2010 -then the solution will upgraded to the current version. - - -#### Using ZSTD DLL with Visual C++ - -The header files from `include\` and the import library `dll\libzstd.lib` -are required to compile a project using Visual C++. - -1. The path to header files should be added to `Additional Include Directories` that can -   be found in project properties `C/C++` then `General`. -2. The import library has to be added to `Additional Dependencies` that can -   be found in project properties `Linker` then `Input`. -   If one will provide only the name `libzstd.lib` without a full path to the library -   the directory has to be added to `Linker\General\Additional Library Directories`. - -The compiled executable will require ZSTD DLL which is available at `dll\libzstd.dll`. diff --git a/lib/dll/example/build_package.bat b/lib/dll/example/build_package.bat deleted file mode 100644 index cf351e762336..000000000000 --- a/lib/dll/example/build_package.bat +++ /dev/null @@ -1,18 +0,0 @@ -@ECHO OFF
 -MKDIR bin\dll bin\static bin\example bin\include
 -COPY tests\fullbench.c bin\example\
 -COPY programs\datagen.c bin\example\
 -COPY programs\datagen.h bin\example\
 -COPY programs\util.h bin\example\
 -COPY programs\platform.h bin\example\
 -COPY lib\common\mem.h bin\example\
 -COPY lib\common\zstd_errors.h bin\example\
 -COPY lib\common\zstd_internal.h bin\example\
 -COPY lib\common\error_private.h bin\example\
 -COPY lib\zstd.h bin\include\
 -COPY lib\libzstd.a bin\static\libzstd_static.lib
 -COPY lib\dll\libzstd.* bin\dll\
 -COPY lib\dll\example\Makefile bin\example\
 -COPY lib\dll\example\fullbench-dll.* bin\example\
 -COPY lib\dll\example\README.md bin\
 -COPY programs\zstd.exe bin\zstd.exe
 diff --git a/lib/dll/example/fullbench-dll.sln b/lib/dll/example/fullbench-dll.sln deleted file mode 100644 index ef8d4c024629..000000000000 --- a/lib/dll/example/fullbench-dll.sln +++ /dev/null @@ -1,25 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00
 -# Visual Studio Express 2012 for Windows Desktop
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench-dll", "fullbench-dll.vcxproj", "{13992FD2-077E-4954-B065-A428198201A9}"
 -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
 -		{13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.ActiveCfg = Debug|Win32
 -		{13992FD2-077E-4954-B065-A428198201A9}.Debug|Win32.Build.0 = Debug|Win32
 -		{13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.ActiveCfg = Debug|x64
 -		{13992FD2-077E-4954-B065-A428198201A9}.Debug|x64.Build.0 = Debug|x64
 -		{13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.ActiveCfg = Release|Win32
 -		{13992FD2-077E-4954-B065-A428198201A9}.Release|Win32.Build.0 = Release|Win32
 -		{13992FD2-077E-4954-B065-A428198201A9}.Release|x64.ActiveCfg = Release|x64
 -		{13992FD2-077E-4954-B065-A428198201A9}.Release|x64.Build.0 = Release|x64
 -	EndGlobalSection
 -	GlobalSection(SolutionProperties) = preSolution
 -		HideSolutionNode = FALSE
 -	EndGlobalSection
 -EndGlobal
 diff --git a/lib/dll/example/fullbench-dll.vcxproj b/lib/dll/example/fullbench-dll.vcxproj deleted file mode 100644 index fbea7832c806..000000000000 --- a/lib/dll/example/fullbench-dll.vcxproj +++ /dev/null @@ -1,181 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 -  <ItemGroup Label="ProjectConfigurations">
 -    <ProjectConfiguration Include="Debug|Win32">
 -      <Configuration>Debug</Configuration>
 -      <Platform>Win32</Platform>
 -    </ProjectConfiguration>
 -    <ProjectConfiguration Include="Debug|x64">
 -      <Configuration>Debug</Configuration>
 -      <Platform>x64</Platform>
 -    </ProjectConfiguration>
 -    <ProjectConfiguration Include="Release|Win32">
 -      <Configuration>Release</Configuration>
 -      <Platform>Win32</Platform>
 -    </ProjectConfiguration>
 -    <ProjectConfiguration Include="Release|x64">
 -      <Configuration>Release</Configuration>
 -      <Platform>x64</Platform>
 -    </ProjectConfiguration>
 -  </ItemGroup>
 -  <PropertyGroup Label="Globals">
 -    <ProjectGuid>{00000000-1CC8-4FD7-9281-6B8DBB9D3DF8}</ProjectGuid>
 -    <Keyword>Win32Proj</Keyword>
 -    <RootNamespace>fullbench-dll</RootNamespace>
 -    <OutDir>$(SolutionDir)bin\$(Platform)_$(Configuration)\</OutDir>
 -    <IntDir>$(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\</IntDir>
 -  </PropertyGroup>
 -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 -    <ConfigurationType>Application</ConfigurationType>
 -    <UseDebugLibraries>true</UseDebugLibraries>
 -    <CharacterSet>MultiByte</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 -    <ConfigurationType>Application</ConfigurationType>
 -    <UseDebugLibraries>true</UseDebugLibraries>
 -    <CharacterSet>MultiByte</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 -    <ConfigurationType>Application</ConfigurationType>
 -    <UseDebugLibraries>false</UseDebugLibraries>
 -    <WholeProgramOptimization>true</WholeProgramOptimization>
 -    <CharacterSet>MultiByte</CharacterSet>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 -    <ConfigurationType>Application</ConfigurationType>
 -    <UseDebugLibraries>false</UseDebugLibraries>
 -    <WholeProgramOptimization>true</WholeProgramOptimization>
 -    <CharacterSet>MultiByte</CharacterSet>
 -  </PropertyGroup>
 -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 -  <ImportGroup Label="ExtensionSettings">
 -  </ImportGroup>
 -  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 -  </ImportGroup>
 -  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 -  </ImportGroup>
 -  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 -  </ImportGroup>
 -  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 -    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 -  </ImportGroup>
 -  <PropertyGroup Label="UserMacros" />
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 -    <LinkIncremental>true</LinkIncremental>
 -    <IncludePath>$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath);</IncludePath>
 -    <RunCodeAnalysis>false</RunCodeAnalysis>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 -    <LinkIncremental>true</LinkIncremental>
 -    <IncludePath>$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath);</IncludePath>
 -    <RunCodeAnalysis>false</RunCodeAnalysis>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 -    <LinkIncremental>false</LinkIncremental>
 -    <IncludePath>$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath);</IncludePath>
 -    <RunCodeAnalysis>false</RunCodeAnalysis>
 -  </PropertyGroup>
 -  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 -    <LinkIncremental>false</LinkIncremental>
 -    <IncludePath>$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath);</IncludePath>
 -    <RunCodeAnalysis>false</RunCodeAnalysis>
 -  </PropertyGroup>
 -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 -    <ClCompile>
 -      <PrecompiledHeader>
 -      </PrecompiledHeader>
 -      <WarningLevel>Level4</WarningLevel>
 -      <Optimization>Disabled</Optimization>
 -      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <TreatWarningAsError>true</TreatWarningAsError>
 -      <EnablePREfast>false</EnablePREfast>
 -      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
 -    </ClCompile>
 -    <Link>
 -      <SubSystem>Console</SubSystem>
 -      <GenerateDebugInformation>true</GenerateDebugInformation>
 -      <AdditionalLibraryDirectories>$(SolutionDir)..\dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 -      <AdditionalDependencies>libzstd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 -      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
 -    </Link>
 -  </ItemDefinitionGroup>
 -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 -    <ClCompile>
 -      <PrecompiledHeader>
 -      </PrecompiledHeader>
 -      <WarningLevel>Level4</WarningLevel>
 -      <Optimization>Disabled</Optimization>
 -      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <TreatWarningAsError>true</TreatWarningAsError>
 -      <EnablePREfast>false</EnablePREfast>
 -      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
 -    </ClCompile>
 -    <Link>
 -      <SubSystem>Console</SubSystem>
 -      <GenerateDebugInformation>true</GenerateDebugInformation>
 -      <AdditionalLibraryDirectories>$(SolutionDir)..\dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 -      <AdditionalDependencies>libzstd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 -    </Link>
 -  </ItemDefinitionGroup>
 -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 -    <ClCompile>
 -      <WarningLevel>Level4</WarningLevel>
 -      <PrecompiledHeader>
 -      </PrecompiledHeader>
 -      <Optimization>MaxSpeed</Optimization>
 -      <FunctionLevelLinking>true</FunctionLevelLinking>
 -      <IntrinsicFunctions>true</IntrinsicFunctions>
 -      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <EnablePREfast>false</EnablePREfast>
 -      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
 -      <TreatWarningAsError>false</TreatWarningAsError>
 -      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 -    </ClCompile>
 -    <Link>
 -      <SubSystem>Console</SubSystem>
 -      <GenerateDebugInformation>true</GenerateDebugInformation>
 -      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 -      <OptimizeReferences>true</OptimizeReferences>
 -      <AdditionalLibraryDirectories>$(SolutionDir)..\dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 -      <AdditionalDependencies>libzstd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 -      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
 -    </Link>
 -  </ItemDefinitionGroup>
 -  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 -    <ClCompile>
 -      <WarningLevel>Level4</WarningLevel>
 -      <PrecompiledHeader>
 -      </PrecompiledHeader>
 -      <Optimization>MaxSpeed</Optimization>
 -      <FunctionLevelLinking>true</FunctionLevelLinking>
 -      <IntrinsicFunctions>true</IntrinsicFunctions>
 -      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 -      <TreatWarningAsError>false</TreatWarningAsError>
 -      <EnablePREfast>false</EnablePREfast>
 -      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
 -      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 -    </ClCompile>
 -    <Link>
 -      <SubSystem>Console</SubSystem>
 -      <GenerateDebugInformation>true</GenerateDebugInformation>
 -      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 -      <OptimizeReferences>true</OptimizeReferences>
 -      <AdditionalLibraryDirectories>$(SolutionDir)..\dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 -      <AdditionalDependencies>libzstd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 -    </Link>
 -  </ItemDefinitionGroup>
 -  <ItemGroup>
 -    <ClCompile Include="datagen.c" />
 -    <ClCompile Include="fullbench.c" />
 -  </ItemGroup>
 -  <ItemGroup>
 -    <ClInclude Include="..\include\zstd.h" />
 -  </ItemGroup>
 -  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 -  <ImportGroup Label="ExtensionTargets">
 -  </ImportGroup>
 -</Project>
\ No newline at end of file  | 
