mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 03:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #415 from xsacha/master

Browse source 
Stdafx: more cleanup
This commit is contained in:
Alexandro Sánchez Bach 2014-07-10 23:29:07 +02:00
commit ca3f621b3b
17 changed files with 37 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -19,13 +19,12 @@ before_install:
- sudo apt-get install libwxgtk3.0-dev libopenal-dev freeglut3-dev libglew-dev
- sudo apt-get install aria2 -qq
- download_extract() { aria2c -x 16 $1 -o $2 && tar -xf $2; }
- if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; export CXX="g++-4.8" CC="gcc-4.8"; else sudo apt-get install libstdc++-4.8-dev; fi
# Travis uses CMake 2.8.7. We require 2.8.8. Grab latest
- sudo apt-get install -qq g++-4.8
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
- sudo apt-get install lib32stdc++6 -qq &&
aria2c -x 16 http://www.cmake.org/files/v2.8/cmake-2.8.12.1-Linux-i386.sh &&
chmod a+x cmake-2.8.12.1-Linux-i386.sh &&
sudo ./cmake-2.8.12.1-Linux-i386.sh --skip-license --prefix=/usr;
aria2c -x 16 http://www.cmake.org/files/v3.0/cmake-3.0.0-Linux-i386.sh &&
chmod a+x cmake-3.0.0-Linux-i386.sh &&
sudo ./cmake-3.0.0-Linux-i386.sh --skip-license --prefix=/usr;
before_script:
- git submodule update --init asmjit ffmpeg

3
Utilities/SMutex.h
View file

@ -1,5 +1,6 @@
#pragma once
#include "BEType.h"
#include "Emu/System.h"
extern void SM_Sleep();
extern size_t SM_GetCurrentThreadId();
@ -123,7 +124,7 @@ public:
default: return res;
}
if (wait) wait();
if (wait != nullptr) wait();
if (timeout && counter++ > timeout)
{

3
rpcs3/Emu/DbgCommand.cpp
View file

@ -1,6 +1,7 @@
#include "stdafx.h"
#include "rpcs3.h"
void SendDbgCommand(DbgCommand id, CPUThread* thr )
{
wxGetApp().SendDbgCommand(id, thr);
}
}

6
rpcs3/Emu/GS/GCM.h
View file

@ -1330,10 +1330,8 @@ static const std::string GetMethodName(const u32 id)
{ NV4097_SET_TRANSFORM_BRANCH_BITS, "SetTransformBranchBits" } ,
};
for (u32 i = 0; i < SARRSIZEOF(METHOD_NAME_LIST); ++i)
{
if(METHOD_NAME_LIST[i].id == id) return "cellGcm" + METHOD_NAME_LIST[i].name;
}
for(auto& s: METHOD_NAME_LIST)
if(s.id == id) return "cellGcm" + s.name;
return fmt::Format("unknown/illegal method [0x%08x]", id);
}

1
rpcs3/Emu/GS/GL/GLGSRender.h
View file

@ -1,6 +1,7 @@
#pragma once
#include "Emu/GS/GSRender.h"
#include "Emu/GS/RSXThread.h"
#include "Utilities/rPlatform.h"
#include "GLBuffers.h"
#include "GLProgramBuffer.h"

2
rpcs3/Emu/GS/GL/GLVertexProgram.cpp
View file

@ -77,7 +77,7 @@ std::string GLVertexDecompilerThread::GetSRC(const u32 n)
ret += m_parr.AddParam(PARAM_NONE, "vec4", "tmp" + std::to_string(src[n].tmp_src));
break;
case 2: //input
if (d1.input_src < SARRSIZEOF(reg_table))
if (d1.input_src < (sizeof(reg_table)/sizeof(reg_table[0])))
{
ret += m_parr.AddParam(PARAM_IN, "vec4", reg_table[d1.input_src], d1.input_src);
}

2
rpcs3/Emu/Io/Keyboard.cpp
View file

@ -38,4 +38,4 @@ void KeyboardManager::Close()
m_keyboard_handler = nullptr;
m_inited = false;
}
}

2
rpcs3/Emu/Io/Mouse.cpp
View file

@ -38,4 +38,4 @@ void MouseManager::Close()
m_mouse_handler = nullptr;
m_inited = false;
}
}

3
rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h
View file

@ -3,6 +3,7 @@
#include <algorithm>
#include <vector>
#include "Emu/Io/KeyboardHandler.h"
#include "rpcs3.h"
class WindowsKeyboardHandler final
: public wxWindow
@ -171,4 +172,4 @@ public:
m_keyboards[0].m_buttons.emplace_back('\\', CELL_KEYC_BACKSLASH_106);
//m_keyboards[0].m_buttons.emplace_back(, CELL_KEYC_YEN_106);
}
};
};

3
rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
View file

@ -5,6 +5,7 @@
#include "Emu/Cell/PPUThread.h"
#include "Emu/SysCalls/SC_FUNC.h"
#include "Emu/SysCalls/Modules.h"
#include "rpcs3.h"
#include "cellSysutil.h"
#include "cellMsgDialog.h"
@ -442,4 +443,4 @@ int cellMsgDialogProgressBarInc(u32 progressBarIndex, u32 delta)
}
});
return CELL_OK;
}
}

9
rpcs3/Emu/System.h
View file

@ -8,9 +8,18 @@
#include "Emu/GS/GSManager.h"
#include "Emu/Audio/AudioManager.h"
#include "Emu/FS/VFS.h"
#include "Emu/DbgCommand.h"
#include "Loader/Loader.h"
#include "SysCalls/Callback.h"
enum Status
{
Running,
Paused,
Stopped,
Ready,
};
class EventManager;
class ModuleManager;
class StaticFuncManager;

1
rpcs3/Gui/CompilerELF.h
View file

@ -4,6 +4,7 @@
#include "Loader/ELF64.h"
#include <wx/aui/aui.h>
#include <wx/richtext/richtextctrl.h>
#include "Gui/MainFrame.h"
class CompilerELF : public FrameBase
{

3
rpcs3/Gui/GSFrame.cpp
View file

@ -1,5 +1,6 @@
#include "stdafx.h"
#include "GSFrame.h"
#include "rpcs3.h"
BEGIN_EVENT_TABLE(GSFrame, wxFrame)
EVT_PAINT(GSFrame::OnPaint)
@ -79,4 +80,4 @@ m_size.SetHeight(height);
//wxFrame::SetSize(width, height);
OnSize(wxSizeEvent());
}
*/
*/

1
rpcs3/Gui/MainFrame.h
View file

@ -2,6 +2,7 @@
#include "Gui/Debugger.h"
#include "Gui/ConLogFrame.h"
#include "Gui/FrameBase.h"
#include <wx/aui/aui.h>

1
rpcs3/Ini.cpp
View file

@ -2,7 +2,6 @@
#include "Ini.h"
#include "Utilities/StrFmt.h"
#include "Utilities/rPlatform.h"
#include <algorithm>
#include <cctype>

3
rpcs3/Ini.h
View file

@ -1,7 +1,8 @@
#pragma once
#include <utility>
#include "../Utilities/simpleini/SimpleIni.h"
#include "Utilities/rPlatform.h"
#include "Utilities/simpleini/SimpleIni.h"
//TODO: make thread safe/remove static singleton
CSimpleIniCaseA *getIniFile();

31
rpcs3/stdafx.h
View file

@ -6,9 +6,6 @@
#include <crtdbg.h>
#endif
/* size of statically declared array */
#define SARRSIZEOF(array) (sizeof(array)/sizeof(array[0]))
#define NOMINMAX
#ifndef QT_UI
#include <wx/wxprec.h>
@ -41,14 +38,10 @@
#include <wx/aui/auibook.h>
#endif
#ifdef MSVC_CRT_MEMLEAK_DETECTION
#ifdef _DEBUG
#ifndef DBG_NEW
#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
#define new DBG_NEW
#endif
#endif // _DEBUG
#endif // MSVC_CRT_MEMLEAK_DETECTION
#if defined(MSVC_CRT_MEMLEAK_DETECTION) && defined(_DEBUG) && !defined(DBG_NEW)
#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
#define new DBG_NEW
#endif
// This header should be frontend-agnostic, so don't assume wx includes everything
#include <cstdio>
@ -68,14 +61,6 @@ typedef int16_t s16;
typedef int32_t s32;
typedef int64_t s64;
enum Status
{
Running,
Paused,
Stopped,
Ready,
};
#include "Utilities/StrFmt.h"
#include "Utilities/Log.h"
#include "Utilities/BEType.h"
@ -84,21 +69,16 @@ enum Status
#include "Utilities/rXml.h"
#include "Utilities/rConcurrency.h"
#include "Utilities/rMsgBox.h"
#include "Utilities/rPlatform.h"
#include "Utilities/Thread.h"
#include "Utilities/Array.h"
#include "Utilities/Timer.h"
#include "Utilities/IdManager.h"
#include "Gui/FrameBase.h"
#include "Emu/System.h"
#include "Emu/SysCalls/Callback.h"
#include "Emu/DbgCommand.h"
#include "Emu/Cell/PPUThread.h"
#include "Emu/SysCalls/SC_FUNC.h"
#include "Emu/SysCalls/Modules.h"
#include "Emu/FS/vfsDirBase.h"
#include "Emu/FS/vfsFileBase.h"
#include "Emu/FS/vfsLocalDir.h"
@ -107,9 +87,6 @@ enum Status
#include "Emu/FS/vfsStreamMemory.h"
#include "Emu/FS/vfsFile.h"
#include "Emu/FS/vfsDir.h"
#ifndef QT_UI
#include "rpcs3.h"
#endif
#define _PRGNAME_ "RPCS3"
#define _PRGVER_ "0.0.0.4"