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

Merge pull request #833 from cxd4/include-path-fixes 

[core] fixed almost all fatal compile errors for Unix build
This commit is contained in:
zilmar 2015-12-21 06:01:43 +11:00
parent 456df42280 865f1f74e7
commit 53b1db1b5c
18 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-core/AppInit.cpp
View File

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include <Common/path.h> #include <Common/path.h>
#include <Common/trace.h> #include <Common/Trace.h>
#include <Common/Util.h> #include <Common/Util.h>
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h> #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>

2
Source/Project64-core/Logging.cpp
View File

@ -9,7 +9,7 @@
* * * *
****************************************************************************/ ****************************************************************************/
#include "stdafx.h" #include "stdafx.h"
#include "logging.h" #include "Logging.h"
#include <Common/path.h> #include <Common/path.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/N64System/Mips/TranslateVaddr.h> #include <Project64-core/N64System/Mips/TranslateVaddr.h>

2
Source/Project64-core/Multilanguage/LanguageClass.h
View File

@ -14,7 +14,7 @@
#include <string> //stl string #include <string> //stl string
#include <map> //stl map #include <map> //stl map
#include <list> //stl list #include <list> //stl list
#include <common/stdtypes.h> #include <Common/stdtypes.h>
typedef std::map<int32_t, std::wstring, std::less<int32_t> > LANG_STRINGS; typedef std::map<int32_t, std::wstring, std::less<int32_t> > LANG_STRINGS;
typedef LANG_STRINGS::value_type LANG_STR; typedef LANG_STRINGS::value_type LANG_STR;

2
Source/Project64-core/N64System/CheatClass.cpp
View File

@ -12,7 +12,7 @@
#include "CheatClass.h" #include "CheatClass.h"
#include <Project64-core/Settings/SettingType/SettingsType-Cheats.h> #include <Project64-core/Settings/SettingType/SettingsType-Cheats.h>
#include <Project64-core/Plugins/GFXplugin.h> #include <Project64-core/Plugins/GFXPlugin.h>
#include <Project64-core/Plugins/AudioPlugin.h> #include <Project64-core/Plugins/AudioPlugin.h>
#include <Project64-core/Plugins/RSPPlugin.h> #include <Project64-core/Plugins/RSPPlugin.h>
#include <Project64-core/Plugins/ControllerPlugin.h> #include <Project64-core/Plugins/ControllerPlugin.h>

2
Source/Project64-core/N64System/EmulationThread.cpp
View File

@ -11,7 +11,7 @@
#include "stdafx.h" #include "stdafx.h"
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64Class.h>
#include <Project64-core/Notification.h> #include <Project64-core/Notification.h>
#include <common/Util.h> #include <Common/Util.h>
#include <Windows.h> #include <Windows.h>
#include <Objbase.h> #include <Objbase.h>

2
Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp
View File

@ -16,7 +16,7 @@
#include <Project64-core/N64System/Mips/OpcodeName.h> #include <Project64-core/N64System/Mips/OpcodeName.h>
#include <Project64-core/N64System/Interpreter/InterpreterOps32.h> #include <Project64-core/N64System/Interpreter/InterpreterOps32.h>
#include <Project64-core/Plugins/PluginClass.h> #include <Project64-core/Plugins/PluginClass.h>
#include <Project64-core/Plugins/GFXplugin.h> #include <Project64-core/Plugins/GFXPlugin.h>
#include <Project64-core/ExceptionHandler.h> #include <Project64-core/ExceptionHandler.h>
R4300iOp::Func * CInterpreterCPU::m_R4300i_Opcode = NULL; R4300iOp::Func * CInterpreterCPU::m_R4300i_Opcode = NULL;

2
Source/Project64-core/N64System/Mips/Mempak.cpp
View File

@ -10,7 +10,7 @@
****************************************************************************/ ****************************************************************************/
#include "stdafx.h" #include "stdafx.h"
#include "Mempak.H" #include "Mempak.H"
#include <common/path.h> #include <Common/path.h>
#include <Windows.h> #include <Windows.h>
static uint8_t Mempaks[4][0x8000]; static uint8_t Mempaks[4][0x8000];

2
Source/Project64-core/N64System/Mips/SystemEvents.h
View File

@ -10,7 +10,7 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <common/CriticalSection.h> #include <Common/CriticalSection.h>
enum SystemEvent enum SystemEvent
{ {

2
Source/Project64-core/N64System/N64Class.cpp
View File

@ -9,7 +9,7 @@
* * * *
****************************************************************************/ ****************************************************************************/
#include "stdafx.h" #include "stdafx.h"
#include "N64class.h" #include "N64Class.h"
#include <Project64-core/3rdParty/zip.h> #include <Project64-core/3rdParty/zip.h>
#include <Project64-core/N64System/Recompiler/x86CodeLog.h> #include <Project64-core/N64System/Recompiler/x86CodeLog.h>
#include <Project64-core/N64System/SystemGlobals.h> #include <Project64-core/N64System/SystemGlobals.h>

2
Source/Project64-core/N64System/Recompiler/CodeBlock.h
View File

@ -9,7 +9,7 @@
* * * *
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <common/md5.h> #include <Common/md5.h>
#include "RecompilerOps.h" #include "RecompilerOps.h"
#include "ExitInfo.h" #include "ExitInfo.h"
#include "CodeSection.h" #include "CodeSection.h"

2
Source/Project64-core/N64System/SpeedLimiterClass.cpp
View File

@ -10,7 +10,7 @@
****************************************************************************/ ****************************************************************************/
#include "stdafx.h" #include "stdafx.h"
#include "SpeedLimiterClass.h" #include "SpeedLimiterClass.h"
#include <common/util.h> #include <Common/Util.h>
#include <Windows.h> #include <Windows.h>
#include <Mmsystem.h> #include <Mmsystem.h>

2
Source/Project64-core/Plugins/GFXPlugin.cpp
View File

@ -13,7 +13,7 @@
#include <Project64-core/N64System/N64RomClass.h> #include <Project64-core/N64System/N64RomClass.h>
#include <Project64-core/N64System/Mips/MemoryClass.h> #include <Project64-core/N64System/Mips/MemoryClass.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/RegisterClass.h>
#include "GFXplugin.h" #include "GFXPlugin.h"
#include <Windows.h> #include <Windows.h>
CGfxPlugin::CGfxPlugin() : CGfxPlugin::CGfxPlugin() :

2
Source/Project64-core/Plugins/RSPPlugin.cpp
View File

@ -13,7 +13,7 @@
#include <Project64-core/N64System/Mips/MemoryClass.h> #include <Project64-core/N64System/Mips/MemoryClass.h>
#include <Project64-core/N64System/Mips/RegisterClass.h> #include <Project64-core/N64System/Mips/RegisterClass.h>
#include "RSPPlugin.h" #include "RSPPlugin.h"
#include "GFXplugin.h" #include "GFXPlugin.h"
#include "AudioPlugin.h" #include "AudioPlugin.h"
#include <Windows.h> #include <Windows.h>

2
Source/Project64-core/Settings/SettingType/SettingsType-Application.h
View File

@ -10,7 +10,7 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <common/IniFileClass.h> #include <Common/IniFileClass.h>
#include "SettingsType-Base.h" #include "SettingsType-Base.h"
class CSettingTypeApplication : class CSettingTypeApplication :

2
Source/Project64-core/Settings/SettingType/SettingsType-ApplicationPath.cpp
View File

@ -11,7 +11,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "SettingsType-Application.h" #include "SettingsType-Application.h"
#include "SettingsType-ApplicationPath.h" #include "SettingsType-ApplicationPath.h"
#include <common/path.h> #include <Common/path.h>
CSettingTypeApplicationPath::CSettingTypeApplicationPath(const char * Section, const char * Name, SettingID DefaultSetting ) : CSettingTypeApplicationPath::CSettingTypeApplicationPath(const char * Section, const char * Name, SettingID DefaultSetting ) :
CSettingTypeApplication(Section,Name,DefaultSetting) CSettingTypeApplication(Section,Name,DefaultSetting)

2
Source/Project64-core/Settings/SettingType/SettingsType-Cheats.h
View File

@ -11,7 +11,7 @@
#pragma once #pragma once
#include "SettingsType-Base.h" #include "SettingsType-Base.h"
#include <common/IniFileClass.h> #include <Common/IniFileClass.h>
class CSettingTypeCheats : class CSettingTypeCheats :
public CSettingType public CSettingType

2
Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.h
View File

@ -10,7 +10,7 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <common/IniFileClass.h> #include <Common/IniFileClass.h>
#include "SettingsType-Base.h" #include "SettingsType-Base.h"
class CSettingTypeRomDatabase : class CSettingTypeRomDatabase :

2
Source/Project64-core/stdafx.h
View File

@ -4,6 +4,6 @@
#include "Multilanguage.h" #include "Multilanguage.h"
#include "Notification.h" #include "Notification.h"
#include "version.h" #include "Version.h"
#include "Settings/SettingsClass.h" #include "Settings/SettingsClass.h"
#include "TraceModulesProject64.h" #include "TraceModulesProject64.h"