Merge branch 'master' into v4.0.0
This commit is contained in:
commit
4fc9c0f75f
5 changed files with 43 additions and 17 deletions
18
ISSUE_TEMPLATE.txt
Normal file
18
ISSUE_TEMPLATE.txt
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
For questions or issues related to using one of Affectiva's SDKs, please use StackOverflow with the
|
||||||
|
"affdex-sdk" tag. The Affectiva team monitors StackOverflow for these questions and will respond
|
||||||
|
there. This approach also helps other developers with the same questions or problems find
|
||||||
|
solutions more quickly.
|
||||||
|
|
||||||
|
https://stackoverflow.com/questions/tagged/affdex-sdk
|
||||||
|
|
||||||
|
|
||||||
|
For more general discussion about our SDKs, please use our SDK forum:
|
||||||
|
|
||||||
|
https://discuss.affectiva.com/c/emotion-sdk
|
||||||
|
|
||||||
|
|
||||||
|
If you have a question or problem directly related to the samples in this repo (not with the SDK
|
||||||
|
itself), please proceed to create an issue here. If you create an issue here that is not
|
||||||
|
related to this repo, we will ask you to move it to one of the locations above, as this helps
|
||||||
|
ensure it gets to the right people and is addressed most effectively. Thanks for your
|
||||||
|
cooperation.
|
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio 2013
|
# Visual Studio 2013
|
||||||
VisualStudioVersion = 12.0.40629.0
|
VisualStudioVersion = 12.0.21005.1
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opencv-webcam-demo", "opencv-webcam-demo\opencv-webcam-demo.vcxproj", "{8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opencv-webcam-demo", "opencv-webcam-demo\opencv-webcam-demo.vcxproj", "{8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}"
|
||||||
EndProject
|
EndProject
|
||||||
|
@ -13,7 +13,9 @@ Global
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}.Release|x64.ActiveCfg = Release|x64
|
{8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{8DCDC209-C25D-4C61-B2AC-2FBA1775DD6B}.Release|x64.Build.0 = Release|x64
|
||||||
{5D5E4401-09DE-40D3-9E29-AFC4F2EF2C80}.Release|x64.ActiveCfg = Release|x64
|
{5D5E4401-09DE-40D3-9E29-AFC4F2EF2C80}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{5D5E4401-09DE-40D3-9E29-AFC4F2EF2C80}.Release|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
16
appveyor.yml
16
appveyor.yml
|
@ -2,21 +2,27 @@ version: 1.0.{build}
|
||||||
image:
|
image:
|
||||||
- Visual Studio 2013
|
- Visual Studio 2013
|
||||||
- Visual Studio 2015
|
- Visual Studio 2015
|
||||||
|
configuration: Release
|
||||||
|
platform: x64
|
||||||
before_build:
|
before_build:
|
||||||
- cmd: >-
|
- cmd: >-
|
||||||
appveyor DownloadFile https://download.affectiva.com/windows/AffdexSDK-3.1-368-win64.exe -FileName AffdexSDK-3.1-368-win64.exe
|
appveyor DownloadFile https://download.affectiva.com/windows/AffdexSDK-3.4.1-575-win64.exe -FileName AffdexSDK-win64.exe
|
||||||
|
|
||||||
AffdexSDK-3.1-368-win64.exe /S
|
AffdexSDK-win64.exe /S
|
||||||
|
|
||||||
nuget restore affdex-win-samples.sln
|
nuget restore affdex-win-samples.sln
|
||||||
|
|
||||||
build:
|
build:
|
||||||
|
project: affdex-win-samples.sln
|
||||||
parallel: true
|
parallel: true
|
||||||
verbosity: detailed
|
verbosity: detailed
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: '\x64\Release'
|
- path: 'x64\Release'
|
||||||
deploy:
|
deploy:
|
||||||
- provider: GitHub
|
- provider: GitHub
|
||||||
release: 3.1
|
release: 3.4
|
||||||
|
artifact: 'x64\Release.zip'
|
||||||
auth_token:
|
auth_token:
|
||||||
secure: sjCE8t4b8ME8j2D6e0kRpNib8STOljgGVPdexj4n0gXU/nYxFkdaI9GXRukRHri5
|
secure: sjCE8t4b8ME8j2D6e0kRpNib8STOljgGVPdexj4n0gXU/nYxFkdaI9GXRukRHri5
|
||||||
artifact: Release.zip
|
on:
|
||||||
|
branch: master # release from master branch only
|
||||||
|
|
|
@ -44,18 +44,18 @@
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<AdditionalIncludeDirectories>C:\Program Files\Affectiva\Affdex SDK\include;../common/;%(AdditionalDependencies)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>C:\Program Files\Affectiva\AffdexSDK\include;../common/;%(AdditionalDependencies)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<AdditionalDependencies>C:\Program Files\Affectiva\Affdex SDK\lib\release\affdex-native.lib;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)</AdditionalDependencies>
|
<AdditionalDependencies>C:\Program Files\Affectiva\AffdexSDK\lib\release\affdex-native.lib;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)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>xcopy /d /y "C:\Program Files\Affectiva\Affdex SDK\bin\release\affdex-native.dll" "$(OutDir)"
|
<Command>xcopy /d /y "C:\Program Files\Affectiva\AffdexSDK\bin\release\affdex-native.dll" "$(OutDir)"
|
||||||
xcopy /d /s /y "C:\Program Files\Affectiva\Affdex SDK\data" "$(OutDir)data\"</Command>
|
xcopy /d /s /y "C:\Program Files\Affectiva\AffdexSDK\data" "$(OutDir)data\"</Command>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -44,19 +44,19 @@
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<SDLCheck>true</SDLCheck>
|
<SDLCheck>true</SDLCheck>
|
||||||
<AdditionalIncludeDirectories>C:\Program Files\Affectiva\Affdex SDK\include;../common;%(AdditionalDependencies)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>C:\Program Files\Affectiva\AffdexSDK\include;../common;%(AdditionalDependencies)</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<AdditionalDependencies>C:\Program Files\Affectiva\Affdex SDK\lib\release\affdex-native.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>C:\Program Files\Affectiva\AffdexSDK\lib\release\affdex-native.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>xcopy /d /y "C:\Program Files\Affectiva\Affdex SDK\bin\release\affdex-native.dll" "$(OutDir)"
|
<Command>xcopy /d /y "C:\Program Files\Affectiva\AffdexSDK\bin\release\affdex-native.dll" "$(OutDir)"
|
||||||
xcopy /d /y "C:\Program Files\Affectiva\Affdex SDK\bin\opencv_ffmpeg248_64.dll" "$(OutDir)"
|
xcopy /d /y "C:\Program Files\Affectiva\AffdexSDK\bin\opencv_ffmpeg248_64.dll" "$(OutDir)"
|
||||||
xcopy /d /s /y "C:\Program Files\Affectiva\Affdex SDK\data" "$(OutDir)data\"</Command>
|
xcopy /d /s /y "C:\Program Files\Affectiva\AffdexSDK\data" "$(OutDir)data\"</Command>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
Loading…
Reference in a new issue