* added dependencies64/freetype to gitignore

* fixed lib-path in psd-test
* removed psd-test from solution build

diff --git a/.gitignore b/.gitignore
index 80ff62c6820d8fe349b64c739afeaea922eb89ab..e83b4c39f5c8416c983fe8aad8eaf14bfa1e1039 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -105,6 +105,7 @@
 /dependencies64/openal
 /dependencies64/sfml
 /dependencies64/tbb
+/dependencies64/freetype
 
 /modules/psd/psd.vcxproj.user
 

diff --git a/casparcg.sln b/casparcg.sln
index 105f796619bc34d0d1dc635cfbcabc986b1ccbc8..fca9bca72690844aaf42ad68ac44d8f5a11c1da5 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -197,14 +197,11 @@ Global
                {866A164B-6F7A-450E-8452-C6AE4E176436}.Release|x64.ActiveCfg = Release|x64\r
                {866A164B-6F7A-450E-8452-C6AE4E176436}.Release|x64.Build.0 = Release|x64\r
                {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Debug|Mixed Platforms.ActiveCfg = Debug|x64\r
-               {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Debug|Mixed Platforms.Build.0 = Debug|x64\r
                {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Debug|Win32.ActiveCfg = Debug|x64\r
                {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Debug|x64.ActiveCfg = Debug|x64\r
                {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Release|Mixed Platforms.ActiveCfg = Release|x64\r
-               {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Release|Mixed Platforms.Build.0 = Release|x64\r
                {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Release|Win32.ActiveCfg = Release|x64\r
                {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Release|x64.ActiveCfg = Release|x64\r
-               {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/test/psd-test/psd-test.vcxproj b/test/psd-test/psd-test.vcxproj
index 387b19f30a47ad0ad7b9d79dd382456d9cd75707..23b93ade6358c21cb7871ca88dc9b4b61974aac4 100644 (file)
--- a/test/psd-test/psd-test.vcxproj
+++ b/test/psd-test/psd-test.vcxproj
@@ -39,13 +39,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <LibraryPath>..\..\dependencies64\boost\stage\lib;$(LibraryPath)</LibraryPath>
+    <LibraryPath>..\..\dependencies64\boost\stage\lib;..\..\dependencies64\tbb\lib;$(LibraryPath)</LibraryPath>
     <IncludePath>..\..\dependencies64\boost;..\..\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>..\..\dependencies64\boost;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\dependencies64\boost\stage\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
+    <IncludePath>..\..\dependencies64\boost;..\..\;$(IncludePath)</IncludePath>
+    <LibraryPath>..\..\dependencies64\boost\stage\lib;..\..\dependencies64\tbb\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>