diff --git a/vs2015/.vs/dosbox-x/v14/.suo b/vs2015/.vs/dosbox-x/v14/.suo
index c170d94e9..afb09a440 100644
Binary files a/vs2015/.vs/dosbox-x/v14/.suo and b/vs2015/.vs/dosbox-x/v14/.suo differ
diff --git a/vs2015/dosbox-x.vcxproj b/vs2015/dosbox-x.vcxproj
index 77e44c264..0b19500bc 100644
--- a/vs2015/dosbox-x.vcxproj
+++ b/vs2015/dosbox-x.vcxproj
@@ -67,22 +67,22 @@
<_ProjectFileVersion>14.0.23107.0
- $(SolutionDir)\..\
- $(Configuration)\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
true
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
true
- $(SolutionDir)\..\
- $(Configuration)\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
false
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
false
@@ -102,7 +102,7 @@
EditAndContinue
- winmm.lib;imm32.lib;opengl32.lib;$(SolutionDir)\..\zlibstat.lib;%(AdditionalDependencies)
+ winmm.lib;imm32.lib;opengl32.lib;%(AdditionalDependencies)
LinkVerboseLib
$(OutDir)DOSBox.exe
true
@@ -129,7 +129,7 @@
ProgramDatabase
- winmm.lib;imm32.lib;opengl32.lib;$(SolutionDir)\..\zlibstat.lib;%(AdditionalDependencies)
+ winmm.lib;imm32.lib;opengl32.lib;%(AdditionalDependencies)
LinkVerboseLib
$(OutDir)DOSBox.exe
true
@@ -151,7 +151,7 @@
ProgramDatabase
- winmm.lib;imm32.lib;opengl32.lib;$(SolutionDir)\..\zlibstat.lib;%(AdditionalDependencies)
+ winmm.lib;imm32.lib;opengl32.lib;%(AdditionalDependencies)
LinkVerboseLib
$(OutDir)DOSBox.exe
true
@@ -178,7 +178,7 @@
ProgramDatabase
- winmm.lib;imm32.lib;opengl32.lib;$(SolutionDir)\..\zlibstat.lib;%(AdditionalDependencies)
+ winmm.lib;imm32.lib;opengl32.lib;%(AdditionalDependencies)
LinkVerboseLib
$(OutDir)DOSBox.exe
true
diff --git a/vs2015/libpng/projects/visualc71/libpng.vcxproj b/vs2015/libpng/projects/visualc71/libpng.vcxproj
index 8700fcbb2..58f437354 100644
--- a/vs2015/libpng/projects/visualc71/libpng.vcxproj
+++ b/vs2015/libpng/projects/visualc71/libpng.vcxproj
@@ -136,47 +136,47 @@
<_ProjectFileVersion>14.0.23107.0
- $(SolutionDir)\..\
- .\Win32_DLL_Release\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
false
- $(SolutionDir)\..\
- .\Win32_DLL_Debug\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
- $(SolutionDir)\..\
- .\Win32_DLL_VB\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
false
- $(SolutionDir)\..\
- .\Win32_LIB_Release\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
- $(SolutionDir)\..\
- .\Win32_LIB_Debug\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
false
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
false
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
diff --git a/vs2015/sdl/VisualC/SDL/SDL.vcxproj b/vs2015/sdl/VisualC/SDL/SDL.vcxproj
index 1bdbfd596..b8afc8e07 100644
--- a/vs2015/sdl/VisualC/SDL/SDL.vcxproj
+++ b/vs2015/sdl/VisualC/SDL/SDL.vcxproj
@@ -68,23 +68,23 @@
<_ProjectFileVersion>14.0.23107.0
- $(SolutionDir)\..\
- $(Configuration)\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
true
- $(SolutionDir)\..\
- $(Configuration)\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
true
- $(SolutionDir)\..\
- $(Configuration)\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
false
- $(SolutionDir)\..\
- $(Configuration)\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
false
diff --git a/vs2015/sdl/VisualC/SDLmain/SDLmain.vcxproj b/vs2015/sdl/VisualC/SDLmain/SDLmain.vcxproj
index fbb4b7c8e..46cb3079c 100644
--- a/vs2015/sdl/VisualC/SDLmain/SDLmain.vcxproj
+++ b/vs2015/sdl/VisualC/SDLmain/SDLmain.vcxproj
@@ -94,28 +94,28 @@
<_ProjectFileVersion>14.0.23107.0
- $(SolutionDir)\..\
- .\Release\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
- $(SolutionDir)\..\
- .\Release\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
- $(SolutionDir)\..\
- .\Release_NOSTDIO\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
- $(SolutionDir)\..\
- .\Debug\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
- $(SolutionDir)\..\
- .\Debug\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
diff --git a/vs2015/sdlnet/VisualC/SDL_net_VS2008.vcxproj b/vs2015/sdlnet/VisualC/SDL_net_VS2008.vcxproj
index 06fcbb809..65048dcf9 100644
--- a/vs2015/sdlnet/VisualC/SDL_net_VS2008.vcxproj
+++ b/vs2015/sdlnet/VisualC/SDL_net_VS2008.vcxproj
@@ -69,22 +69,22 @@
<_ProjectFileVersion>14.0.23107.0
- $(SolutionDir)\..\
- .\Debug\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
true
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
true
- $(SolutionDir)\..\
- .\Release\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
false
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
false
diff --git a/vs2015/zlib/contrib/vstudio/vc9/zlibstat.vcxproj b/vs2015/zlib/contrib/vstudio/vc9/zlibstat.vcxproj
index 91b842473..7728702d4 100644
--- a/vs2015/zlib/contrib/vstudio/vc9/zlibstat.vcxproj
+++ b/vs2015/zlib/contrib/vstudio/vc9/zlibstat.vcxproj
@@ -88,27 +88,27 @@
<_ProjectFileVersion>14.0.23107.0
- $(SolutionDir)\..\
- x86\ZlibStat$(Configuration)\Tmp\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
- $(SolutionDir)\..\
- x86\ZlibStat$(Configuration)\Tmp\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
- $(SolutionDir)\..\
- x86\ZlibStat$(Configuration)\Tmp\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
- $(SolutionDir)\..\
+ $(SolutionDir)\..\bin\$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\