ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

windows: make object files relative to their directory so vs isn't drunk with 2 files sharing the same filename

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2021-05-15 12:13:08 +02:00 committed by Kojin
parent 4803ed0a4e
commit 8281b57c56
4 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/GS/GS.h
View File

@ -25,8 +25,6 @@
#ifdef _WIN32 #ifdef _WIN32
#include "targetver.h"
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <windows.h> #include <windows.h>

18
pcsx2/GS/targetver.h
View File

@ -1,18 +0,0 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2021 PCSX2 Dev Team
*
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with PCSX2.
* If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define _WIN32_WINNT 0x0600

7
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -74,6 +74,12 @@
<MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">false</MinimalRebuild> <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">false</MinimalRebuild>
<MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</MinimalRebuild> <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</MinimalRebuild>
<MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">false</MinimalRebuild> <MinimalRebuild Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">false</MinimalRebuild>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Devel|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Devel|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(RelativeDir)</ObjectFileName>
</ClCompile> </ClCompile>
<Link> <Link>
<LargeAddressAware>Yes</LargeAddressAware> <LargeAddressAware>Yes</LargeAddressAware>
@ -875,7 +881,6 @@
<ClInclude Include="..\..\GS\Window\GSWndDX.h" /> <ClInclude Include="..\..\GS\Window\GSWndDX.h" />
<ClInclude Include="..\..\GS\Window\GSWndWGL.h" /> <ClInclude Include="..\..\GS\Window\GSWndWGL.h" />
<ClInclude Include="..\..\GS\resource.h" /> <ClInclude Include="..\..\GS\resource.h" />
<ClInclude Include="..\..\GS\targetver.h" />
<ClInclude Include="..\..\IPU\IPUdma.h" /> <ClInclude Include="..\..\IPU\IPUdma.h" />
<ClInclude Include="..\..\Mdec.h" /> <ClInclude Include="..\..\Mdec.h" />
<ClInclude Include="..\..\Patch.h" /> <ClInclude Include="..\..\Patch.h" />

9
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
View File

@ -1794,9 +1794,6 @@
<ClInclude Include="..\..\Ipu\mpeg2lib\Vlc.h"> <ClInclude Include="..\..\Ipu\mpeg2lib\Vlc.h">
<Filter>System\Ps2\IPU\mpeg2lib</Filter> <Filter>System\Ps2\IPU\mpeg2lib</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\GS.h">
<Filter>System\Ps2\GS</Filter>
</ClInclude>
<ClInclude Include="..\..\DebugTools\Debug.h"> <ClInclude Include="..\..\DebugTools\Debug.h">
<Filter>System\Ps2\Debug</Filter> <Filter>System\Ps2\Debug</Filter>
</ClInclude> </ClInclude>
@ -2583,9 +2580,6 @@
<ClInclude Include="..\..\GS\config.h"> <ClInclude Include="..\..\GS\config.h">
<Filter>System\Ps2\GS</Filter> <Filter>System\Ps2\GS</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\GS\targetver.h">
<Filter>System\Ps2\GS</Filter>
</ClInclude>
<ClInclude Include="..\..\GS\GSPng.h"> <ClInclude Include="..\..\GS\GSPng.h">
<Filter>System\Ps2\GS</Filter> <Filter>System\Ps2\GS</Filter>
</ClInclude> </ClInclude>
@ -2599,6 +2593,9 @@
<Filter>System\Ps2\GS</Filter> <Filter>System\Ps2\GS</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\GS\resource.h" /> <ClInclude Include="..\..\GS\resource.h" />
<ClInclude Include="..\..\GS.h">
<Filter>System\Ps2</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\wxResources.rc"> <ResourceCompile Include="..\wxResources.rc">