diff --git a/.travis.yml b/.travis.yml
index 134b88e29..993acc966 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -142,4 +142,5 @@ matrix:
- gcc-6-multilib
script:
- - sh -c "$Cmd"
+ - JOB_NUMBER = $(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:'
+ - [ $JOB_NUMBER -eq 9 ] || [ $JOB_NUMBER -eq 10 ] && sh -c "$Cmd"
diff --git a/build/VS2010/datagen/datagen.vcxproj b/build/VS2010/datagen/datagen.vcxproj
index 6460de3a5..bd8a213da 100644
--- a/build/VS2010/datagen/datagen.vcxproj
+++ b/build/VS2010/datagen/datagen.vcxproj
@@ -22,7 +22,8 @@
{037E781E-81A6-494B-B1B3-438AB1200523}
Win32Proj
datagen
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)bin\$(Platform)_$(Configuration)\
+ $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\
@@ -67,7 +68,6 @@
true
false
$(IncludePath);$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath);
- $(Platform)\$(Configuration)\
true
@@ -78,7 +78,6 @@
false
false
$(IncludePath);$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath);
- $(Platform)\$(Configuration)\
false
diff --git a/build/VS2010/fullbench/fullbench.vcxproj b/build/VS2010/fullbench/fullbench.vcxproj
index ea0f06e47..67fd62ba7 100644
--- a/build/VS2010/fullbench/fullbench.vcxproj
+++ b/build/VS2010/fullbench/fullbench.vcxproj
@@ -22,7 +22,8 @@
{61ABD629-1CC8-4FD7-9281-6B8DBB9D3DF8}
Win32Proj
fullbench
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)bin\$(Platform)_$(Configuration)\
+ $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\
@@ -67,7 +68,6 @@
true
$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath);
false
- $(Platform)\$(Configuration)\
true
@@ -78,7 +78,6 @@
false
$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath);
false
- $(Platform)\$(Configuration)\
false
diff --git a/build/VS2010/fuzzer/fuzzer.vcxproj b/build/VS2010/fuzzer/fuzzer.vcxproj
index 020e521aa..82fc02167 100644
--- a/build/VS2010/fuzzer/fuzzer.vcxproj
+++ b/build/VS2010/fuzzer/fuzzer.vcxproj
@@ -22,7 +22,8 @@
{6FD4352B-346C-4703-96EA-D4A8B9A6976E}
Win32Proj
fuzzer
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)bin\$(Platform)_$(Configuration)\
+ $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\
@@ -67,7 +68,6 @@
true
false
$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath);
- $(Platform)\$(Configuration)\
true
@@ -78,7 +78,6 @@
false
false
$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath);
- $(Platform)\$(Configuration)\
false
diff --git a/build/VS2010/zstd/zstd.vcxproj b/build/VS2010/zstd/zstd.vcxproj
index 181bbe6df..c7a9ed73c 100644
--- a/build/VS2010/zstd/zstd.vcxproj
+++ b/build/VS2010/zstd/zstd.vcxproj
@@ -78,7 +78,8 @@
{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}
Win32Proj
zstd
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)bin\$(Platform)_$(Configuration)\
+ $(SolutionDir)bin\obj\$(RootNamespace)_$(Platform)_$(Configuration)\
@@ -124,7 +125,6 @@
$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath);
false
$(LibraryPath)
- $(Platform)\$(Configuration)\
true
@@ -137,7 +137,6 @@
$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath);
false
$(LibraryPath)
- $(Platform)\$(Configuration)\
false