From 67fd5dffd9769a3d7fe8436bd79e05df7afd7b05 Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Wed, 9 Nov 2016 14:05:44 +0100 Subject: updated appveyor.yml --- appveyor.yml | 4 ++-- lib/lz4.h | 2 +- visual/VS2010/lz4.sln | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 85d8ea2..d96ebc8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -70,7 +70,7 @@ build_script: ECHO *** Building Visual Studio 2015 %PLATFORM%\%CONFIGURATION% && ECHO *** && msbuild "visual\VS2010\lz4.sln" /m /verbosity:minimal /property:PlatformToolset=v140 /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && - COPY visual\VS2010\bin\%PLATFORM%\%CONFIGURATION%\*.exe programs\ + COPY visual\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe programs\ ) test_script: @@ -84,6 +84,6 @@ test_script: lz4 -i1b5 lz4.exe && lz4 -i1b10 lz4.exe && lz4 -i1b15 lz4.exe && - echo lz4 tested && + echo ------- lz4 tested ------- && fullbench.exe -i1 fullbench.exe ) diff --git a/lib/lz4.h b/lib/lz4.h index f7e2097..1a66227 100644 --- a/lib/lz4.h +++ b/lib/lz4.h @@ -58,7 +58,7 @@ extern "C" { #if defined(LZ4_DLL_EXPORT) && (LZ4_DLL_EXPORT==1) # define LZ4LIB_API __declspec(dllexport) #elif defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1) -# define LZ4LIB_API __declspec(dllimport) +# define LZ4LIB_API __declspec(dllimport) /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/ #else # define LZ4LIB_API #endif diff --git a/visual/VS2010/lz4.sln b/visual/VS2010/lz4.sln index 6858164..d3725ae 100644 --- a/visual/VS2010/lz4.sln +++ b/visual/VS2010/lz4.sln @@ -15,6 +15,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "datagen", "datagen\datagen.vcxproj", "{D745AE2F-596A-403A-9B91-81A8C6779243}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench-dll", "fullbench-dll\fullbench-dll.vcxproj", "{13992FD2-077E-4954-B065-A428198201A9}" + ProjectSection(ProjectDependencies) = postProject + {9800039D-4AAA-43A4-BB78-FEF6F4836927} = {9800039D-4AAA-43A4-BB78-FEF6F4836927} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution -- cgit v0.12