Dolphin now builds on Linux with only Source/Core as include dir
This commit is contained in:
parent
dc1db82f70
commit
362dec9c7c
|
@ -474,18 +474,6 @@ endif()
|
||||||
#
|
#
|
||||||
include_directories(Source/Core)
|
include_directories(Source/Core)
|
||||||
|
|
||||||
# TODO(delroth): Remove when relative-includes is done.
|
|
||||||
include_directories(Source/Core/AudioCommon)
|
|
||||||
include_directories(Source/Core/Common)
|
|
||||||
include_directories(Source/Core/Core)
|
|
||||||
include_directories(Source/Core/DebuggerUICommon)
|
|
||||||
include_directories(Source/Core/DebuggerWX)
|
|
||||||
include_directories(Source/Core/DiscIO)
|
|
||||||
include_directories(Source/Core/DolphinWX)
|
|
||||||
include_directories(Source/Core/InputCommon)
|
|
||||||
include_directories(Source/Core/VideoCommon)
|
|
||||||
include_directories(Source/Core/VideoUICommon)
|
|
||||||
|
|
||||||
########################################
|
########################################
|
||||||
# Process externals and setup their include directories
|
# Process externals and setup their include directories
|
||||||
#
|
#
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
#include "Common/Common.h"
|
#include "Common/Common.h"
|
||||||
#include "Common/Hash.h"
|
#include "Common/Hash.h"
|
||||||
|
|
||||||
#include "Core/Host.h"
|
#include "Core/Host.h"
|
||||||
#include "Core/ConfigManager.h"
|
#include "Core/ConfigManager.h"
|
||||||
#include "Core/DSP/DSPAnalyzer.h"
|
#include "Core/DSP/DSPAnalyzer.h"
|
||||||
|
@ -14,8 +13,7 @@
|
||||||
#include "Core/HW/DSPLLE/DSPSymbols.h"
|
#include "Core/HW/DSPLLE/DSPSymbols.h"
|
||||||
#include "Core/HW/DSPLLE/DSPLLETools.h"
|
#include "Core/HW/DSPLLE/DSPLLETools.h"
|
||||||
#include "Core/PowerPC/PowerPC.h"
|
#include "Core/PowerPC/PowerPC.h"
|
||||||
|
#include "VideoCommon/OnScreenDisplay.h"
|
||||||
#include "OnScreenDisplay.h"
|
|
||||||
|
|
||||||
// The user of the DSPCore library must supply a few functions so that the
|
// The user of the DSPCore library must supply a few functions so that the
|
||||||
// emulation core can access the environment it runs in. If the emulation
|
// emulation core can access the environment it runs in. If the emulation
|
||||||
|
|
|
@ -3,20 +3,19 @@
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include "Core/ConfigManager.h"
|
#include "Core/ConfigManager.h"
|
||||||
|
#include "Core/CoreTiming.h"
|
||||||
#include "Core/Movie.h"
|
#include "Core/Movie.h"
|
||||||
#include "Core/HW/EXI.h"
|
#include "Core/HW/EXI.h"
|
||||||
#include "Core/HW/EXI_Channel.h"
|
#include "Core/HW/EXI_Channel.h"
|
||||||
#include "Core/HW/EXI_Device.h"
|
#include "Core/HW/EXI_Device.h"
|
||||||
#include "Core/HW/MMIO.h"
|
#include "Core/HW/MMIO.h"
|
||||||
|
#include "Core/HW/ProcessorInterface.h"
|
||||||
|
#include "Core/PowerPC/PowerPC.h"
|
||||||
|
|
||||||
#define EXI_READ 0
|
#define EXI_READ 0
|
||||||
#define EXI_WRITE 1
|
#define EXI_WRITE 1
|
||||||
#define EXI_READWRITE 2
|
#define EXI_READWRITE 2
|
||||||
|
|
||||||
#include "ProcessorInterface.h"
|
|
||||||
#include "../PowerPC/PowerPC.h"
|
|
||||||
#include "CoreTiming.h"
|
|
||||||
|
|
||||||
CEXIChannel::CEXIChannel(u32 ChannelId) :
|
CEXIChannel::CEXIChannel(u32 ChannelId) :
|
||||||
m_DMAMemoryAddress(0),
|
m_DMAMemoryAddress(0),
|
||||||
m_DMALength(0),
|
m_DMALength(0),
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include "Common/CommonPaths.h"
|
#include "Common/CommonPaths.h"
|
||||||
#include "Common/FileUtil.h"
|
#include "Common/FileUtil.h"
|
||||||
#include "Common/SettingsHandler.h"
|
#include "Common/SettingsHandler.h"
|
||||||
|
#include "Common/StringUtil.h"
|
||||||
|
|
||||||
#include "Core/ConfigManager.h"
|
#include "Core/ConfigManager.h"
|
||||||
#include "Core/ec_wii.h"
|
#include "Core/ec_wii.h"
|
||||||
|
@ -457,7 +458,6 @@ bool CWII_IPC_HLE_Device_net_wd_command::Close(u32 CommandAddress, bool Force)
|
||||||
// This is just for debugging / playing around.
|
// This is just for debugging / playing around.
|
||||||
// There really is no reason to implement wd unless we can bend it such that
|
// There really is no reason to implement wd unless we can bend it such that
|
||||||
// we can talk to the DS.
|
// we can talk to the DS.
|
||||||
#include "StringUtil.h"
|
|
||||||
bool CWII_IPC_HLE_Device_net_wd_command::IOCtlV(u32 CommandAddress)
|
bool CWII_IPC_HLE_Device_net_wd_command::IOCtlV(u32 CommandAddress)
|
||||||
{
|
{
|
||||||
u32 return_value = 0;
|
u32 return_value = 0;
|
||||||
|
|
|
@ -204,9 +204,9 @@ bool AVIDump::SetVideoFormat()
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include "FileUtil.h"
|
#include "Common/FileUtil.h"
|
||||||
#include "StringUtil.h"
|
#include "Common/Log.h"
|
||||||
#include "Log.h"
|
#include "Common/StringUtil.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include <libavcodec/avcodec.h>
|
#include <libavcodec/avcodec.h>
|
||||||
|
|
|
@ -2,24 +2,24 @@
|
||||||
// Licensed under GPLv2
|
// Licensed under GPLv2
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include "Common.h"
|
#include "Common/Common.h"
|
||||||
#include "VideoCommon.h"
|
#include "Common/MathUtil.h"
|
||||||
#include "VideoConfig.h"
|
#include "Common/Thread.h"
|
||||||
#include "MathUtil.h"
|
#include "Common/Atomic.h"
|
||||||
#include "Thread.h"
|
#include "Common/ChunkFile.h"
|
||||||
#include "Atomic.h"
|
#include "Core/ConfigManager.h"
|
||||||
#include "Fifo.h"
|
#include "Core/Core.h"
|
||||||
#include "ChunkFile.h"
|
#include "Core/CoreTiming.h"
|
||||||
#include "CommandProcessor.h"
|
#include "Core/HW/GPFifo.h"
|
||||||
#include "PixelEngine.h"
|
#include "Core/HW/Memmap.h"
|
||||||
#include "CoreTiming.h"
|
#include "Core/HW/MMIO.h"
|
||||||
#include "ConfigManager.h"
|
#include "Core/HW/ProcessorInterface.h"
|
||||||
#include "HW/ProcessorInterface.h"
|
#include "Core/HW/SystemTimers.h"
|
||||||
#include "HW/GPFifo.h"
|
#include "VideoCommon/CommandProcessor.h"
|
||||||
#include "HW/Memmap.h"
|
#include "VideoCommon/Fifo.h"
|
||||||
#include "HW/SystemTimers.h"
|
#include "VideoCommon/PixelEngine.h"
|
||||||
#include "Core.h"
|
#include "VideoCommon/VideoCommon.h"
|
||||||
#include "HW/MMIO.h"
|
#include "VideoCommon/VideoConfig.h"
|
||||||
|
|
||||||
namespace CommandProcessor
|
namespace CommandProcessor
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue