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

linux fix: 

rename Gte.c into Gte.cpp need to be done on windows too
rename a duplicated function. Until we get a nice name for it.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5923 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2014-03-06 23:30:11 +00:00
parent 6ccebbf7a8
commit 9d41fe251b
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcsx2/CMakeLists.txt
View File

@ -116,6 +116,7 @@ set(pcsx2Sources
Gif.cpp Gif.cpp
Gif_Logger.cpp Gif_Logger.cpp
Gif_Unit.cpp Gif_Unit.cpp
Gte.cpp
GS.cpp GS.cpp
GSState.cpp GSState.cpp
Hw.cpp Hw.cpp
@ -152,6 +153,7 @@ set(pcsx2Sources
Sif.cpp Sif.cpp
Sif0.cpp Sif0.cpp
Sif1.cpp Sif1.cpp
sif2.cpp
Sio.cpp Sio.cpp
SourceLog.cpp SourceLog.cpp
SPR.cpp SPR.cpp
@ -613,9 +615,6 @@ set(pcsx2SSources
# change language of .S-files to c++ # change language of .S-files to c++
set_source_files_properties(${pcsx2SSources} PROPERTIES LANGUAGE CXX) set_source_files_properties(${pcsx2SSources} PROPERTIES LANGUAGE CXX)
# C++11 is used for debug tools, so we enable it
set_source_files_properties(${pcsx2DebugToolsSources} PROPERTIES COMPILE_FLAGS "-std=c++0x")
# common Sources # common Sources
set(Common set(Common
${pcsx2Sources} ${pcsx2Sources}

0
pcsx2/Gte.c → pcsx2/Gte.cpp
View File

2
pcsx2/sif2.cpp
View File

@ -367,7 +367,7 @@ __fi void EEsif2Interrupt()
sif2dma.chcr.STR = false; sif2dma.chcr.STR = false;
} }
__fi void dmaSIF2() __fi void _dmaSIF2()
{ {
DevCon.Warning("SIF2 EE CHCR %x", sif2dma.chcr._u32); DevCon.Warning("SIF2 EE CHCR %x", sif2dma.chcr._u32);
SIF_LOG(wxString(L"dmaSIF2" + sif2dma.cmqt_to_str()).To8BitData()); SIF_LOG(wxString(L"dmaSIF2" + sif2dma.cmqt_to_str()).To8BitData());