* win32

  - Exclude top-level dir from includes
  - Use unified build dir for pcsxr and plugins

1 files changed, 32 insertions, 29 deletions

diff --git a/win32/plugins/PadSSSPSX/PadSSSPSX.vcxproj b/win32/plugins/PadSSSPSX/PadSSSPSX.vcxproj
index 9c562bbb..3a6c067d 100755
--- a/win32/plugins/PadSSSPSX/PadSSSPSX.vcxproj
+++ b/win32/plugins/PadSSSPSX/PadSSSPSX.vcxproj
@@ -11,9 +11,10 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>SSSPSXpad</ProjectName>

+    <ProjectName>PadSSSPSX</ProjectName>

     <ProjectGuid>{0639CDF3-8C1F-47F4-A760-F5568194A083}</ProjectGuid>

-    <RootNamespace>SSSPSXpad</RootNamespace>

+    <RootNamespace>PadSSSPSX</RootNamespace>

+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -21,6 +22,7 @@
     <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

     <PlatformToolset>v140</PlatformToolset>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

@@ -42,11 +44,11 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)build\$(Configuration)\plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)build\$(Configuration)\plugins\$(ProjectName)\obj\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\$(Configuration)\plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)build\$(Configuration)\plugins\$(ProjectName)\obj\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

@@ -61,7 +63,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>.\Debug/PadSSSPSX.tlb</TypeLibraryName>

+      <TypeLibraryName>$(OutDir)\$(TargetName).tlb</TypeLibraryName>

       <HeaderFileName>

       </HeaderFileName>

     </Midl>

@@ -70,11 +72,11 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SSSPSXPAD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeaderOutputFile>.\Debug/PadSSSPSX.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

-      <ObjectFileName>.\Debug/</ObjectFileName>

-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeaderOutputFile>$(OutDir)\$(TargetName).pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

@@ -85,22 +87,22 @@
     </ResourceCompile>

     <Link>

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>$(SolutionDir)$(Configuration)\PadSSSPSX.dll</OutputFile>

+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <ModuleDefinitionFile>.\PadSSSPSX.def</ModuleDefinitionFile>

+      <ModuleDefinitionFile>$(TargetName).def</ModuleDefinitionFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>.\Debug/PadSSSPSX.pdb</ProgramDatabaseFile>

+      <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>.\Debug/PadSSSPSX.lib</ImportLibrary>

+      <ImportLibrary>$(OutDir)\$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

       <AdditionalLibraryDirectories>

       </AdditionalLibraryDirectories>

     </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Debug/PadSSSPSX.bsc</OutputFile>

+      <OutputFile>$(OutDir)\$(TargetName).bsc</OutputFile>

     </Bscmake>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -109,23 +111,24 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>.\Release/PadSSSPSX.tlb</TypeLibraryName>

+      <TypeLibraryName>$(OutDir)\$(TargetName).tlb</TypeLibraryName>

       <HeaderFileName>

       </HeaderFileName>

     </Midl>

     <ClCompile>

-      <Optimization>MaxSpeed</Optimization>

+      <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SSSPSXPAD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeaderOutputFile>.\Release/PadSSSPSX.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

-      <ObjectFileName>.\Release/</ObjectFileName>

-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <PrecompiledHeaderOutputFile>$(OutDir)\$(TargetName).pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

+      <ObjectFileName>$(IntDir)</ObjectFileName>

+      <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -133,21 +136,21 @@
     </ResourceCompile>

     <Link>

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>.\Release/PadSSSPSX.dll</OutputFile>

+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <ModuleDefinitionFile>.\PadSSSPSX.def</ModuleDefinitionFile>

-      <ProgramDatabaseFile>.\Release/PadSSSPSX.pdb</ProgramDatabaseFile>

+      <ModuleDefinitionFile>$(TargetName).def</ModuleDefinitionFile>

+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>.\Release/PadSSSPSX.lib</ImportLibrary>

+      <ImportLibrary>$(OutDir)\$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

       <AdditionalLibraryDirectories>

       </AdditionalLibraryDirectories>

     </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Release/PadSSSPSX.bsc</OutputFile>

+      <OutputFile>$(OutDir)\$(TargetName).bsc</OutputFile>

     </Bscmake>

   </ItemDefinitionGroup>

   <ItemGroup>