cmake: s/_LINUX/__linux__/

This commit is contained in:
Gregory Hainaut 2014-12-15 19:14:30 +01:00
parent 532cc7755c
commit 4773bcf0ea
11 changed files with 16 additions and 17 deletions

View File

@ -10,7 +10,6 @@ endif()
set(Output GSdx-0.1.16)
set(CommonFlags
-D_LINUX
-fno-operator-names # because Xbyak uses and()/xor()/or()/not() function
-mfpmath=sse
#-Wstrict-aliasing # Allow to track strict aliasing issue.

View File

@ -319,7 +319,7 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
int w = theApp.GetConfig("ModeWidth", 0);
int h = theApp.GetConfig("ModeHeight", 0);
#ifdef _LINUX
#ifdef __linux__
for(uint32 i = 0; i < 2; i++) {
try
{
@ -362,7 +362,7 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
{
s_gs->SetMultithreaded(true);
#ifdef _LINUX
#ifdef __linux__
if (s_gs->m_wnd) {
// A window was already attached to s_gs so we also
// need to restore the window state (Attach)
@ -415,7 +415,7 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
EXPORT_C_(int) GSopen2(void** dsp, uint32 flags)
{
#ifdef _LINUX
#ifdef __linux__
// Use ogl renderer as default otherwise it crash at startup
// GSRenderOGL only GSDeviceOGL (not GSDeviceNULL)
int renderer = theApp.GetConfig("renderer", 12);
@ -440,7 +440,7 @@ EXPORT_C_(int) GSopen2(void** dsp, uint32 flags)
}
#endif
#ifdef _LINUX
#ifdef __linux__
switch(renderer) {
case 13: renderer = 12; break; // OGL: SW to HW
case 12: renderer = 13; break; // OGL: HW to SW
@ -1419,7 +1419,7 @@ EXPORT_C GSBenchmark(HWND hwnd, HINSTANCE hinst, LPSTR lpszCmdLine, int nCmdShow
#endif
#ifdef _LINUX
#ifdef __linux__
#include <sys/time.h>
#include <sys/timeb.h> // ftime(), struct timeb

View File

@ -413,6 +413,6 @@ GSAdapter::GSAdapter(const D3DADAPTER_IDENTIFIER9 &desc_d3d9)
{
}
#endif
#ifdef _LINUX
#ifdef __linux__
// TODO
#endif

View File

@ -193,7 +193,7 @@ struct GSAdapter
GSAdapter(const DXGI_ADAPTER_DESC1 &desc_dxgi);
GSAdapter(const D3DADAPTER_IDENTIFIER9 &desc_d3d9);
#endif
#ifdef _LINUX
#ifdef __linux__
// TODO
#endif
};

View File

@ -21,7 +21,7 @@
#include "stdafx.h"
#include "GSRenderer.h"
#ifdef _LINUX
#ifdef __linux__
#include <X11/keysym.h>
#endif
@ -583,7 +583,7 @@ void GSRenderer::KeyEvent(GSKeyEventData* e)
}
}
#elif defined(_LINUX)
#elif defined(__linux__)
if(e->type == KEYPRESS)
{
int step = m_shift_key ? -1 : 1;

View File

@ -22,7 +22,7 @@
#include "stdafx.h"
#include "GSWndEGL.h"
#if defined(_LINUX)
#if defined(__linux__)
GSWndEGL::GSWndEGL()
: m_NativeWindow(0), m_NativeDisplay(NULL)

View File

@ -21,7 +21,7 @@
#include "GSWnd.h"
#if defined(_LINUX)
#if defined(__linux__)
#include <X11/Xlib.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>

View File

@ -22,7 +22,7 @@
#include "stdafx.h"
#include "GSWndOGL.h"
#if defined(_LINUX) && !defined(ENABLE_GLES)
#if defined(__linux__) && !defined(ENABLE_GLES)
GSWndOGL::GSWndOGL()
: m_NativeWindow(0), m_NativeDisplay(NULL), m_swapinterval(NULL)
{

View File

@ -21,7 +21,7 @@
#include "GSWnd.h"
#if defined(_LINUX) && !defined(ENABLE_GLES)
#if defined(__linux__) && !defined(ENABLE_GLES)
#include <X11/Xlib.h>
#include <GL/glx.h>

View File

@ -194,7 +194,7 @@ GSdxApp::GSdxApp()
m_gpu_scale.push_back(GSSetting(2 | (2 << 2), "H x 4 - V x 4", ""));
}
#ifdef _LINUX
#ifdef __linux__
void GSdxApp::ReloadConfig()
{
if (m_configuration_map.empty()) return;

View File

@ -27,7 +27,7 @@ class GSdxApp
{
std::string m_ini;
std::string m_section;
#ifdef _LINUX
#ifdef __linux__
std::map< std::string, std::string > m_configuration_map;
#endif
@ -40,7 +40,7 @@ public:
HMODULE GetModuleHandle() {return (HMODULE)GetModuleHandlePtr();}
#endif
#ifdef _LINUX
#ifdef __linux__
void BuildConfigurationMap(const char* lpFileName);
void ReloadConfig();