diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index d19ecee56d..47fee24e46 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -100,7 +100,6 @@ NoExtensions - zlib-dbg.lib;rpcrt4.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName)-dbg.exe Yes @@ -124,7 +123,6 @@ NoExtensions - zlib-dev.lib;rpcrt4.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) Yes @@ -147,7 +145,6 @@ CompileAsCpp - zlib.lib;rpcrt4.lib;%(AdditionalDependencies) $(TargetDir)$(TargetName).pdb Yes diff --git a/pcsx2/windows/VCprojects/vsprops/common.props b/pcsx2/windows/VCprojects/vsprops/common.props index 7ab06f7e4b..a817dfbc38 100644 --- a/pcsx2/windows/VCprojects/vsprops/common.props +++ b/pcsx2/windows/VCprojects/vsprops/common.props @@ -18,11 +18,11 @@ $(IntDir)pcsx2.pch Default true - _ARCH_64=1;_M_X86_64;%(PreprocessorDefinitions) - _ARCH_32=1;_M_X86_32;%(PreprocessorDefinitions) + _ARCH_64=1;_M_X86_64;%(PreprocessorDefinitions) + _ARCH_32=1;_M_X86_32;%(PreprocessorDefinitions) - odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;%(AdditionalDependencies) + comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;%(AdditionalDependencies) ..\;..\libs;%(AdditionalLibraryDirectories) true Windows diff --git a/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj b/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj index 8c1774b65c..af683d31e9 100644 --- a/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj +++ b/plugins/CDVDiso/src/Windows/CDVDiso.vcxproj @@ -85,7 +85,6 @@ $(SvnRootDir)\3rdparty\bzip2;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) - bzip2-dbg.lib;zlib-dbg.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) .\CDVDiso.def MachineX86 @@ -99,7 +98,6 @@ $(SvnRootDir)\3rdparty\bzip2;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) - bzip2.lib;zlib.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) .\CDVDiso.def true @@ -116,7 +114,6 @@ $(SvnRootDir)\3rdparty\bzip2;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) - bzip2-dev.lib;zlib-dev.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) .\CDVDiso.def true diff --git a/plugins/GSdx/vsprops/common.props b/plugins/GSdx/vsprops/common.props index f421bb2e9d..cb4385f2c1 100644 --- a/plugins/GSdx/vsprops/common.props +++ b/plugins/GSdx/vsprops/common.props @@ -17,7 +17,7 @@ true - d3d11.lib;d3d10_1.lib;d3d9.lib;dxgi.lib;dxguid.lib;winmm.lib;strmiids.lib;opengl32.lib;opencl.lib;comsuppw.lib;comctl32.lib;%(AdditionalDependencies) + d3d11.lib;d3d9.lib;dxgi.lib;dxguid.lib;winmm.lib;strmiids.lib;opengl32.lib;comsuppw.lib;comctl32.lib;%(AdditionalDependencies) d3d9.dll;d3d11.dll;dxgi.dll;opengl32.dll;%(DelayLoadDLLs) true Windows diff --git a/plugins/GSdx_legacy/vsprops/common.props b/plugins/GSdx_legacy/vsprops/common.props index e013f88c2c..535b76dd92 100644 --- a/plugins/GSdx_legacy/vsprops/common.props +++ b/plugins/GSdx_legacy/vsprops/common.props @@ -17,7 +17,7 @@ true - d3d11.lib;d3d10_1.lib;d3d9.lib;dxgi.lib;dxguid.lib;winmm.lib;strmiids.lib;opengl32.lib;opencl.lib;comsuppw.lib;comctl32.lib;%(AdditionalDependencies) + d3d11.lib;d3d9.lib;dxgi.lib;dxguid.lib;winmm.lib;strmiids.lib;opengl32.lib;comsuppw.lib;comctl32.lib;%(AdditionalDependencies) d3d9.dll;d3d11.dll;dxgi.dll;opengl32.dll;%(DelayLoadDLLs) true Windows @@ -25,7 +25,7 @@ $(VTUNE_AMPLIFIER_XE_2015_DIR)lib32;%(AdditionalLibraryDirectories) - "$(SvnCommonDir)\vsprops\preBuild.cmd" "$(ProjectRootDir)" + "$(SolutionDir)common\vsprops\preBuild.cmd" diff --git a/plugins/zerospu2/Windows/ZeroSPU2.vcxproj b/plugins/zerospu2/Windows/ZeroSPU2.vcxproj index 6747927729..21dd66309b 100644 --- a/plugins/zerospu2/Windows/ZeroSPU2.vcxproj +++ b/plugins/zerospu2/Windows/ZeroSPU2.vcxproj @@ -72,7 +72,7 @@ - dsound.lib;winmm.lib;soundtouch-dbg.lib;%(AdditionalDependencies) + dsound.lib;winmm.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) ZeroSPU2.def Windows @@ -85,7 +85,7 @@ NDEBUG;%(PreprocessorDefinitions) - dsound.lib;winmm.lib;soundtouch.lib;%(AdditionalDependencies) + dsound.lib;winmm.lib;%(AdditionalDependencies) ZeroSPU2.def Windows false @@ -99,7 +99,7 @@ false - dsound.lib;winmm.lib;soundtouch-dev.lib;%(AdditionalDependencies) + dsound.lib;winmm.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) ZeroSPU2.def Windows