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

Some more missing .props, sneaky bastards. (when you select a bunch of files in search results and use svn > add, it ONLY ADDS A FEW! the rest remain ignored, silently) 

Some more wxCore fixes.
Fixed also inter-project dependency warnings.
Also some other fixed to get devel/release compiling.
Oh and apparently my VCproject folder got messed up and detached itself from svn, so it wasn't commiting with the rest...


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2849 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gigaherz 2010-04-14 20:46:24 +00:00
parent 204a0fb667
commit 4917361197
15 changed files with 2116 additions and 1716 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/w32pthreads/pthreads_lib.vcxproj vendored
View File

@ -633,7 +633,7 @@
<None Include="PCSX2.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="pthreads_2008.vcxproj">
<ProjectReference Include="pthreads.vcxproj">
<Project>{26511268-2902-4997-8421-ecd7055f9e28}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

2
3rdparty/wxWidgets/build/msw/wx_adv.vcxproj vendored
View File

@ -216,7 +216,7 @@
<ClInclude Include="..\..\include\wx\wizard.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="wx_config_2008.vcxproj">
<ProjectReference Include="wx_config.vcxproj">
<Project>{c34487af-228a-4d11-8e50-27803df76873}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

2
3rdparty/wxWidgets/build/msw/wx_base.vcxproj vendored
View File

@ -375,7 +375,7 @@
<ClInclude Include="..\..\include\wx\zstream.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="wx_config_2008.vcxproj">
<ProjectReference Include="wx_config.vcxproj">
<Project>{c34487af-228a-4d11-8e50-27803df76873}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

2
3rdparty/wxWidgets/build/msw/wx_core.vcxproj vendored
View File

@ -1519,7 +1519,7 @@
<Project>{bc236261-77e8-4567-8d09-45cd02965eb6}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="wx_config_2008.vcxproj">
<ProjectReference Include="wx_config.vcxproj">
<Project>{c34487af-228a-4d11-8e50-27803df76873}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

2
common/build/Utilities/utilities.vcxproj
View File

@ -179,7 +179,7 @@
<ClInclude Include="..\..\include\Utilities\Threading.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\3rdparty\wxWidgets\build\msw\wx_base_2008.vcxproj">
<ProjectReference Include="..\..\..\3rdparty\wxWidgets\build\msw\wx_base.vcxproj">
<Project>{48ad7e0a-25b1-4974-a1e3-03f8c438d34f}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

160
pcsx2/windows/VCprojects/IopSif.cpp Normal file
View File

@ -0,0 +1,160 @@
#include "PrecompiledHeader.h"
#include "IopCommon.h"
#include "Sif.h"
#if FALSE
const u32 fifoSize = 0x1000; // in bytes
s32 PrepareEEWrite()
{
return 0;
}
s32 PrepareEERead()
{
static __aligned16 u32 tag[4];
// Process DMA tag at hw_dma(9).tadr
sif0.iop.data = *(sifData *)iopPhysMem(hw_dma(9).tadr);
sif0.iop.data.words = (sif0.iop.data.words + 3) & 0xfffffffc; // Round up to nearest 4.
memcpy(tag, (u32*)iopPhysMem(hw_dma(9).tadr + 8), 16);
hw_dma(9).tadr += 16; ///hw_dma(9).madr + 16 + sif0.sifData.words << 2;
// We're only copying the first 24 bits.
hw_dma(9).madr = sif0data & 0xFFFFFF;
sif0.iop.counter = sif0words;
if (sif0tag.IRQ || (sif0tag.ID & 4)) sif0.iop.end = true;
SIF_LOG("SIF0 IOP to EE Tag: madr=%lx, tadr=%lx, counter=%lx (%08X_%08X)"
"\n\tread tag: %x %x %x %x", hw_dma(9).madr, hw_dma(9).tadr, sif0.iop.counter, sif0words, sif0data,
tag[0], tag[1], tag[2], tag[3]);
sif0dma->unsafeTransfer(((tDMA_TAG*)(tag)));
sif0dma->madr = tag[1];
tDMA_TAG ptag(tag[0]);
SIF_LOG("SIF0 EE dest chain tag madr:%08X qwc:%04X id:%X irq:%d(%08X_%08X)",
sif0dma->madr, sif0dma->qwc, ptag.ID, ptag.IRQ, tag[1], tag[0]);
if (sif0dma->chcr.TIE && ptag.IRQ)
{
//Console.WriteLn("SIF0 TIE");
sif0.ee.end = true;
}
switch (ptag.ID)
{
case TAG_REFE:
sif0.ee.end = true;
if (dmacRegs->ctrl.STS != NO_STS)
dmacRegs->stadr.ADDR = sif0dma->madr + (sif0dma->qwc * 16);
break;
case TAG_REFS:
if (dmacRegs->ctrl.STS != NO_STS)
dmacRegs->stadr.ADDR = sif0dma->madr + (sif0dma->qwc * 16);
break;
case TAG_END:
sif0.ee.end = true;
break;
}
return true;
}
void FinalizeEERead()
{
SIF_LOG("Sif0: End EE");
sif0.ee.end = false;
sif0.ee.busy = false;
SIF_LOG("CPU INT FIRED SIF0");
CPU_INT(DMAC_SIF0, 16);
}
s32 DoSIFWrite(u32 iopAvailable)
{
u32 eeAvailable = PrepareEEWrite();
}
s32 DoSifRead(u32 iopAvailable)
{
u32 eeAvailable = PrepareEERead();
u32 transferSizeBytes = min(min(iopAvailable,eeAvailable),fifoSize);
u32 transferSizeWords = transferSizeBytes >> 2;
u32 transferSizeQWords = transferSizeBytes >> 4;
SIF_LOG("Write IOP to EE: +++++++++++ %lX of %lX", transferSizeWords, sif0.iop.counter);
tDMA_TAG *ptag = sif0dma->getAddr(sif0dma->madr, DMAC_SIF0);
if (ptag == NULL)
{
DevCon.Warning("Write IOP to EE: ptag == NULL");
return false;
}
memcpy((u32*)ptag, (u32*)iopPhysMem(hw_dma(9).madr), transferSizeBytes);
// Clearing handled by vtlb memory protection and manual blocks.
//Cpu->Clear(sif0dma->madr, readSize*4);
sif0dma->madr += transferSizeBytes;
sif0.ee.cycles += transferSizeQWords * 2;
sif0dma->qwc -= transferSizeQWords;
return transferSizeBytes;
}
s32 CALLBACK sif0DmaRead (s32 channel, u32* data, u32 bytesLeft, u32* bytesProcessed)
{
s32 processed = DoSIFWrite(bytesLeft);
if(processed>0)
{
bytesLeft -= processed;
if(bytesLeft == 0)
FinalizeEERead();
*bytesProcessed = processed;
return 0;
}
*bytesProcessed=0;
return -processed;
}
s32 CALLBACK sif0DmaWrite (s32 channel, u32* data, u32 bytesLeft, u32* bytesProcessed)
{
DevCon.Warning("SIF0 Dma Write to iop?!");
*bytesProcessed=0; return 0;
}
void CALLBACK sif0DmaInterrupt (s32 channel)
{
}
s32 CALLBACK sif1DmaRead (s32 channel, u32* data, u32 bytesLeft, u32* bytesProcessed)
{
DevCon.Warning("SIF1 Dma Read from iop?!");
*bytesProcessed=0; return 0;
}
s32 CALLBACK sif1DmaWrite (s32 channel, u32* data, u32 bytesLeft, u32* bytesProcessed)
{
*bytesProcessed=0;
return 0;
}
void CALLBACK sif1DmaInterrupt (s32 channel)
{
}
#endif

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

4
pcsx2/windows/VCprojects/pcsx2_2008.vcproj
View File

@ -1126,6 +1126,10 @@
RelativePath="..\..\IopMem.h"
>
</File>
<File
RelativePath=".\IopSif.cpp"
>
</File>
<File
RelativePath="..\..\IopSio2.cpp"
>

12
plugins/CDVDolio/vsprops/sse4.props Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_M_SSE=0x401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
</ItemDefinitionGroup>
</Project>

13
plugins/CDVDolio/vsprops/ssse3.props Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
<_PropertySheetDisplayName>sse3</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<PreprocessorDefinitions>_M_SSE=0x301;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
</Project>

6
plugins/GSdx/GSdx.vcxproj
View File

@ -1441,15 +1441,15 @@
<ResourceCompile Include="GSdx.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\3rdparty\glew\glew_static_vs2008.vcxproj">
<ProjectReference Include="..\..\3rdparty\glew\glew_static.vcxproj">
<Project>{067d7863-393b-494f-b296-4a8853eb3d1d}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\3rdparty\w32pthreads\pthreads_2008.vcxproj">
<ProjectReference Include="..\..\3rdparty\w32pthreads\pthreads.vcxproj">
<Project>{26511268-2902-4997-8421-ecd7055f9e28}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\3rdparty\w32pthreads\pthreads_lib_2008.vcxproj">
<ProjectReference Include="..\..\3rdparty\w32pthreads\pthreads_lib.vcxproj">
<Project>{7e9b2be7-cec3-4f14-847b-0ab8d562fb86}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

20
plugins/GSdx/vsprops/sse4.props Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<SSEtype>SSE4</SSEtype>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_M_SSE=0x401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<BuildMacro Include="SSEtype">
<Value>$(SSEtype)</Value>
</BuildMacro>
</ItemGroup>
</Project>

12
plugins/spu2-x/src/Windows/Spu2-X.vcxproj
View File

@ -528,27 +528,27 @@
<Project>{e9b51944-7e6d-4bcd-83f2-7bbd5a46182d}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\3rdparty\w32pthreads\pthreads_2008.vcxproj">
<ProjectReference Include="..\..\..\..\3rdparty\w32pthreads\pthreads.vcxproj">
<Project>{26511268-2902-4997-8421-ecd7055f9e28}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\3rdparty\w32pthreads\pthreads_lib_2008.vcxproj">
<ProjectReference Include="..\..\..\..\3rdparty\w32pthreads\pthreads_lib.vcxproj">
<Project>{7e9b2be7-cec3-4f14-847b-0ab8d562fb86}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\3rdparty\wxWidgets\build\msw\wx_adv_2008.vcxproj">
<ProjectReference Include="..\..\..\..\3rdparty\wxWidgets\build\msw\wx_adv.vcxproj">
<Project>{0e231fb1-f3c9-4724-accb-de8bcb3c089e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\3rdparty\wxWidgets\build\msw\wx_base_2008.vcxproj">
<ProjectReference Include="..\..\..\..\3rdparty\wxWidgets\build\msw\wx_base.vcxproj">
<Project>{48ad7e0a-25b1-4974-a1e3-03f8c438d34f}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\3rdparty\wxWidgets\build\msw\wx_config_2008.vcxproj">
<ProjectReference Include="..\..\..\..\3rdparty\wxWidgets\build\msw\wx_config.vcxproj">
<Project>{c34487af-228a-4d11-8e50-27803df76873}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\3rdparty\wxWidgets\build\msw\wx_core_2008.vcxproj">
<ProjectReference Include="..\..\..\..\3rdparty\wxWidgets\build\msw\wx_core.vcxproj">
<Project>{0318ba30-ef48-441a-9e10-dc85efae39f0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

12
plugins/xpad/vsprops/sse4.props Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_M_SSE=0x401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
</ItemDefinitionGroup>
</Project>