Fix PadSSSPSX building, properly fix ZeroSPU2 and the null plugins too. Remove nullplugin_svnroot.props since it's not used anymore (I misunderstood the way props work).

Silence many of the warnings related to TargetName. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2861 96395faa-99c1-11dd-bbfe-3dabce05a288
2010-04-15 22:18:32 +00:00 · 2010-04-15 22:18:32 +00:00 · cd36e5fd24
parent a91d499f17
commit cd36e5fd24
27 changed files with 47 additions and 62 deletions
--- a/3rdparty/3rdpartyDLL.props
+++ b/3rdparty/3rdpartyDLL.props
@ -16,7 +16,7 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
-      <OutputFile>$(SolutionDir)\bin\$(ProjectName).dll</OutputFile>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
--- a/3rdparty/w32pthreads/pthreads.vcxproj
+++ b/3rdparty/w32pthreads/pthreads.vcxproj
@ -73,6 +73,8 @@
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-dbg</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">$(ProjectName)-dev</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@ -85,7 +87,7 @@
    </ClCompile>
    <Link>
      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)\bin\$(ProjectName).debug.dll</OutputFile>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).debug.dll</OutputFile>
      <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
    </Link>
  </ItemDefinitionGroup>
--- a/3rdparty/wxWidgets/build/msw/wx_adv.vcxproj
+++ b/3rdparty/wxWidgets/build/msw/wx_adv.vcxproj
@ -75,6 +75,8 @@
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-dbg</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">$(ProjectName)-dev</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
--- a/common/vsprops/BaseProperties.props
+++ b/common/vsprops/BaseProperties.props
@ -3,7 +3,7 @@
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
    <_PropertySheetDisplayName>PcsxBaseProperties</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)\bin\$(PcsxSubsection)\</OutDir>
+    <OutDir>$(SolutionDir)bin\$(PcsxSubsection)\</OutDir>
    <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
    <ExtensionsToDeleteOnClean>*.bsc;*.idb;*.sbr;*.res;*.pch;*.pdb;*.obj;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
  </PropertyGroup>
--- a/common/vsprops/CodeGen_Debug.props
+++ b/common/vsprops/CodeGen_Debug.props
@ -2,11 +2,12 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+    <TargetName>$(ProjectName)-dbg</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;_SECURE_SCL_THROWS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PCSX2_DEBUG;PCSX2_DEVBUILD;_SECURE_SCL_=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    </ClCompile>
--- a/common/vsprops/CodeGen_Devel.props
+++ b/common/vsprops/CodeGen_Devel.props
@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+    <TargetName>$(ProjectName)-dev</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
@ -10,7 +11,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <PreprocessorDefinitions>PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;_SECURE_SCL_THROWS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <BufferSecurityCheck>false</BufferSecurityCheck>
    </ClCompile>
--- a/common/vsprops/CodeGen_Release.props
+++ b/common/vsprops/CodeGen_Release.props
@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+    <TargetName>$(ProjectName)</TargetName>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <ItemDefinitionGroup>
@ -13,7 +14,7 @@
      <OmitFramePointers>true</OmitFramePointers>
      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <PreprocessorDefinitions>NDEBUG;_SECURE_SCL_=0;_SECURE_SCL_THROWS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_SECURE_SCL_=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <MinimalRebuild>true</MinimalRebuild>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
--- a/common/vsprops/IncrementalLinking.props
+++ b/common/vsprops/IncrementalLinking.props
@ -3,6 +3,7 @@
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)-dbg</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
--- a/common/vsprops/common.props
+++ b/common/vsprops/common.props
@ -8,7 +8,6 @@
    <_PropertySheetDisplayName>common</_PropertySheetDisplayName>
    <OutDir>$(SolutionDir)bin\$(PcsxSubsection)</OutDir>
    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName)</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
--- a/common/vsprops/nullplugin_svnroot.props
+++ b/common/vsprops/nullplugin_svnroot.props
@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="UserMacros">
-    <PcsxSubsection>plugins</PcsxSubsection>
-    <ProjectRootDir>$(ProjectDir)..</ProjectRootDir>
-    <SvnRootDir>$(ProjectRootDir)\..\..</SvnRootDir>
-    <SvnCommonDir>$(SvnRootDir)\common</SvnCommonDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <_PropertySheetDisplayName>PluginSvnRoot</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\..\3rdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="PcsxSubsection">
-      <Value>$(PcsxSubsection)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ProjectRootDir">
-      <Value>$(ProjectRootDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SvnRootDir">
-      <Value>$(SvnRootDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SvnCommonDir">
-      <Value>$(SvnCommonDir)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
--- a/plugins/CDVDnull/Windows/CDVDnull.vcxproj
+++ b/plugins/CDVDnull/Windows/CDVDnull.vcxproj
@ -22,7 +22,7 @@
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\CodeGen_Release.props" />
--- a/plugins/CDVDnull/Windows/ProjectRootDir.props
+++ b/plugins/CDVDnull/Windows/ProjectRootDir.props
@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="UserMacros">
    <SvnRootDir>$(ProjectRootDir)\..\..</SvnRootDir>
+    <SvnCommonDir>$(SvnRootDir)\common</SvnCommonDir>
  </PropertyGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
--- a/plugins/FWnull/Windows/FWnull.vcxproj
+++ b/plugins/FWnull/Windows/FWnull.vcxproj
@ -31,14 +31,14 @@
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\CodeGen_Release.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\IncrementalLinking.props" />
--- a/plugins/FWnull/Windows/ProjectRootDir.props
+++ b/plugins/FWnull/Windows/ProjectRootDir.props
@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="UserMacros">
    <SvnRootDir>$(ProjectRootDir)\..\..</SvnRootDir>
+    <SvnCommonDir>$(SvnRootDir)\common</SvnCommonDir>
  </PropertyGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
--- a/plugins/GSdx/vsprops/common.props
+++ b/plugins/GSdx/vsprops/common.props
@ -17,7 +17,7 @@
      <AdditionalDependencies>JITProfiling.lib;d3d11.lib;d3dx11.lib;d3d10_1.lib;d3dx10.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;winmm.lib;strmiids.lib;xinput.lib;cg.lib;cgGL.lib;glut32.lib;glew_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(ProjectName)-$(SSEtype).dll</OutputFile>
      <AdditionalLibraryDirectories>./vtune;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>d3d9.dll;d3dx9_42.dll;d3d10.dll;d3d10_1.dll;d3dx10_42.dll;d3d11.dll;d3dx11_42.dll;cg.dll;cgGL.dll;glut32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>d3d9.dll;d3dx9_42.dll;d3d11.dll;d3dx11_42.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
--- a/plugins/GSnull/Windows/GSnull.vcxproj
+++ b/plugins/GSnull/Windows/GSnull.vcxproj
@ -31,14 +31,14 @@
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\CodeGen_Release.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\IncrementalLinking.props" />
--- a/plugins/GSnull/Windows/ProjectRootDir.props
+++ b/plugins/GSnull/Windows/ProjectRootDir.props
@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="UserMacros">
    <SvnRootDir>$(ProjectRootDir)\..\..</SvnRootDir>
+    <SvnCommonDir>$(SvnRootDir)\common</SvnCommonDir>
  </PropertyGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
--- a/plugins/PadNull/Windows/PadNull.vcxproj
+++ b/plugins/PadNull/Windows/PadNull.vcxproj
@ -31,14 +31,14 @@
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\CodeGen_Release.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\IncrementalLinking.props" />
--- a/plugins/PadNull/Windows/ProjectRootDir.props
+++ b/plugins/PadNull/Windows/ProjectRootDir.props
@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="UserMacros">
    <SvnRootDir>$(ProjectRootDir)\..\..</SvnRootDir>
+    <SvnCommonDir>$(SvnRootDir)\common</SvnCommonDir>
  </PropertyGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
--- a/plugins/SSSPSXPAD/ProjectRootDir.props
+++ b/plugins/SSSPSXPAD/ProjectRootDir.props
@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="UserMacros">
-    <SvnRootDir>$(ProjectRootDir)\..</SvnRootDir>
+    <ProjectRootDir>$(ProjectDir).</ProjectRootDir>
+    <SvnRootDir>$(ProjectRootDir)\..\..</SvnRootDir>
+    <SvnCommonDir>$(SvnRootDir)\common</SvnCommonDir>
  </PropertyGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
--- a/plugins/USBnull/Windows/ProjectRootDir.props
+++ b/plugins/USBnull/Windows/ProjectRootDir.props
@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="UserMacros">
    <SvnRootDir>$(ProjectRootDir)\..\..</SvnRootDir>
+    <SvnCommonDir>$(SvnRootDir)\common</SvnCommonDir>
  </PropertyGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
--- a/plugins/USBnull/Windows/USBnull.vcxproj
+++ b/plugins/USBnull/Windows/USBnull.vcxproj
@ -31,14 +31,14 @@
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\CodeGen_Release.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\IncrementalLinking.props" />
--- a/plugins/dev9null/Windows/DEV9null.vcxproj
+++ b/plugins/dev9null/Windows/DEV9null.vcxproj
@ -31,14 +31,14 @@
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\CodeGen_Release.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\IncrementalLinking.props" />
--- a/plugins/dev9null/Windows/ProjectRootDir.props
+++ b/plugins/dev9null/Windows/ProjectRootDir.props
@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="UserMacros">
    <SvnRootDir>$(ProjectRootDir)\..\..</SvnRootDir>
+    <SvnCommonDir>$(SvnRootDir)\common</SvnCommonDir>
  </PropertyGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
--- a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj
+++ b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj
@ -121,7 +121,7 @@
      </HeaderFileName>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\3rdparty\portaudio\include\portaudio\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\portaudio\include\portaudio\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>FLOAT_SAMPLES;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
@ -137,7 +137,7 @@
    <Link>
      <AdditionalDependencies>rpcrt4.lib;winmm.lib;dsound.lib;comctl32.lib;soundtouch.lib;x86emitter.lib;utilities.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(ProjectName)-dev.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)\3rdparty\portaudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\portaudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ModuleDefinitionFile>.\Spu2-X.def</ModuleDefinitionFile>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <TargetMachine>MachineX86</TargetMachine>
@ -159,7 +159,7 @@
      </HeaderFileName>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\3rdparty\portaudio\include\portaudio\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\portaudio\include\portaudio\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>FLOAT_SAMPLES;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <PrecompiledHeader>Use</PrecompiledHeader>
@ -172,7 +172,7 @@
    <Link>
      <AdditionalDependencies>rpcrt4.lib;winmm.lib;dsound.lib;comctl32.lib;soundtouch.lib;x86emitter.lib;utilities.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(ProjectName)-dbg.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)\3rdparty\portaudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\portaudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ModuleDefinitionFile>.\Spu2-X.def</ModuleDefinitionFile>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
@ -192,7 +192,7 @@
      </HeaderFileName>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\3rdparty\portaudio\include\portaudio\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\portaudio\include\portaudio\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>FLOAT_SAMPLES;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
@ -208,7 +208,7 @@
    <Link>
      <AdditionalDependencies>rpcrt4.lib;winmm.lib;dsound.lib;comctl32.lib;soundtouch.lib;x86emitter.lib;utilities.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)\3rdparty\portaudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\portaudio;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <ModuleDefinitionFile>.\Spu2-X.def</ModuleDefinitionFile>
      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
      <StripPrivateSymbols>
@ -233,7 +233,7 @@
      </HeaderFileName>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)\3rdparty\portaudio\include\portaudio\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)3rdparty\portaudio\include\portaudio\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>wxUSE_GUI=0;FLOAT_SAMPLES;DEBUG_FAST;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ExceptionHandling>Async</ExceptionHandling>
      <PrecompiledHeader>Use</PrecompiledHeader>
--- a/plugins/zerospu2/Windows/ProjectRootDir.props
+++ b/plugins/zerospu2/Windows/ProjectRootDir.props
@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="UserMacros">
+    <ProjectRootDir>$(ProjectDir)..</ProjectRootDir>
    <SvnRootDir>$(ProjectRootDir)\..\..</SvnRootDir>
+    <SvnCommonDir>$(SvnRootDir)\common</SvnCommonDir>
  </PropertyGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
--- a/plugins/zerospu2/Windows/ZeroSPU2.vcxproj
+++ b/plugins/zerospu2/Windows/ZeroSPU2.vcxproj
@ -40,7 +40,7 @@
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" />
@ -49,7 +49,7 @@
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" />
@ -57,7 +57,7 @@
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\common\vsprops\nullplugin_svnroot.props" />
+    <Import Project="..\..\..\common\vsprops\plugin_svnroot.props" />
    <Import Project="ProjectRootDir.props" />
    <Import Project="..\..\..\common\vsprops\BaseProperties.props" />
    <Import Project="..\..\..\common\vsprops\3rdpartyDeps.props" />