Config.h should never be included directly, but rather through Common.h
for portability. (It is a bit unfortunate that some of the plugins have a Config.h of their own, which can confuse this matter.) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5795 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
2be444965a
commit
7ce5e5d1bd
|
@ -18,7 +18,7 @@
|
||||||
#ifndef _OPENALSTREAM_H_
|
#ifndef _OPENALSTREAM_H_
|
||||||
#define _OPENALSTREAM_H_
|
#define _OPENALSTREAM_H_
|
||||||
|
|
||||||
#include <Common.h>
|
#include "Common.h"
|
||||||
#include "SoundStream.h"
|
#include "SoundStream.h"
|
||||||
#include "Thread.h"
|
#include "Thread.h"
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <Common.h>
|
#include "Common.h"
|
||||||
#include "aldlist.h"
|
#include "aldlist.h"
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include "../../../../Externals/OpenAL/include/al.h"
|
#include "../../../../Externals/OpenAL/include/al.h"
|
||||||
|
|
|
@ -18,9 +18,7 @@
|
||||||
#ifndef _COMMON_PATHS_H_
|
#ifndef _COMMON_PATHS_H_
|
||||||
#define _COMMON_PATHS_H_
|
#define _COMMON_PATHS_H_
|
||||||
|
|
||||||
#ifdef __linux__
|
#include "Common.h"
|
||||||
#include "Config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Library suffix/prefix
|
// Library suffix/prefix
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
|
@ -25,10 +25,8 @@
|
||||||
#include <wx/combobox.h>
|
#include <wx/combobox.h>
|
||||||
#include <wx/checkbox.h>
|
#include <wx/checkbox.h>
|
||||||
#include <wx/gbsizer.h>
|
#include <wx/gbsizer.h>
|
||||||
#ifndef _WIN32
|
|
||||||
#include "Config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
#include "Common.h"
|
||||||
#include "CoreParameter.h"
|
#include "CoreParameter.h"
|
||||||
#include "WXInputBase.h"
|
#include "WXInputBase.h"
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "Common.h"
|
#include "Common.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "Config.h"
|
|
||||||
#include "pluginspecs_video.h"
|
#include "pluginspecs_video.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
Loading…
Reference in New Issue