From 982ea35d44c55269fe40b648c260e9ee2610b892 Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Sun, 8 Jun 2014 16:43:53 +0200 Subject: [PATCH 1/2] enable full precompiled headers for non-Windows Platforms for now to make people not guess all the time what to include --- rpcs3/stdafx.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index c53fe16278..cafdb54861 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -280,7 +280,6 @@ enum Status #include "Utilities/IdManager.h" #include "Utilities/StrFmt.h" -#ifdef _WIN32 #include "Emu/SysCalls/Callback.h" #include "Ini.h" #include "Gui/FrameBase.h" @@ -302,7 +301,6 @@ enum Status #include "Emu/FS/vfsFile.h" #include "Emu/FS/vfsDir.h" #include "rpcs3.h" -#endif #define _PRGNAME_ "RPCS3" #define _PRGVER_ "0.0.0.4" From 4d84507c9616fb0f650d10e29052465780af9fca Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Sun, 8 Jun 2014 16:58:40 +0200 Subject: [PATCH 2/2] try include guards to circumvent a weird error with gcc and unity builds --- rpcs3/Emu/Cell/PPUThread.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h index a88ba21060..c7cdef1bf3 100644 --- a/rpcs3/Emu/Cell/PPUThread.h +++ b/rpcs3/Emu/Cell/PPUThread.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef PPUTHREAD_H +#define PPUTHREAD_H #include "Emu/Cell/PPCThread.h" #include "Emu/SysCalls/SysCalls.h" #include "rpcs3.h" @@ -861,3 +862,4 @@ protected: }; PPUThread& GetCurrentPPUThread(); +#endif //PPUTHREAD_H