From b51ac8d77923538e7eaf9bdb6a4fcfa5006f5b0b Mon Sep 17 00:00:00 2001 From: "gregory.hainaut@gmail.com" Date: Sat, 9 Apr 2011 08:39:54 +0000 Subject: [PATCH] gsdx: add also a check of m_windows to play it self. pcsx2: add a define to print the revision number with cmake git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4560 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/CMakeLists.txt | 1 + pcsx2/System.cpp | 2 +- plugins/GSdx/GSWnd.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 98017fe74a..aba494727a 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -8,6 +8,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED) # set common flags set(CommonFlags + -DLINUX_PRINT_SVN_NUMBER -pthread -fvisibility=hidden -fno-guess-branch-probability diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp index f1ee447a34..0fa0f5360a 100644 --- a/pcsx2/System.cpp +++ b/pcsx2/System.cpp @@ -154,7 +154,7 @@ void SysOutOfMemory_EmergencyResponse(uptr blocksize) } -#if _MSC_VER +#if _MSC_VER || defined(LINUX_PRINT_SVN_NUMBER) # include "svnrev.h" #endif diff --git a/plugins/GSdx/GSWnd.cpp b/plugins/GSdx/GSWnd.cpp index 60579f183f..42e51439a4 100644 --- a/plugins/GSdx/GSWnd.cpp +++ b/plugins/GSdx/GSWnd.cpp @@ -352,7 +352,7 @@ bool GSWnd::Create(const string& title, int w, int h) m_window = SDL_CreateWindow(title.c_str(), 100, 100, w, h, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE); - return true; + return (m_window != NULL); } Display* GSWnd::GetDisplay()