From d01542ee0a524d2da7dbbbf6da0b26f42bcc1e32 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 17 Dec 2010 22:13:58 +0000 Subject: [PATCH] Fix another part of issue 3716 missed in the last revision. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6602 8ced0084-cf51-0410-be5f-012b33b47a6e --- CMakeLists.txt | 5 +++-- Source/Core/DolphinWX/Src/FrameTools.cpp | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59e2f5bb14..989150af51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,6 +102,9 @@ include(CheckLib) include(FindOpenGL REQUIRED) include_directories(${OPENGL_INCLUDE_DIR}) +if(NOT OPENGL_GLU_FOUND) + message(FATAL_ERROR "GLU is required but not found") +endif() include(FindALSA OPTIONAL) if(ALSA_FOUND) @@ -297,8 +300,6 @@ if(WIN32) find_library(GLEW glew32s PATHS Externals/GLew) include_directories(Externals/GLew/include) else() - check_lib(GLU GLU GL/glu.h REQUIRED) - check_lib(GLEW GLEW GL/glew.h) if(NOT GLEW_FOUND) message("Shared GLEW not found, falling back to the static library") diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 7d90bfbe9e..845a5b6f74 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -700,7 +700,8 @@ void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event)) void CFrame::OnRenderParentClose(wxCloseEvent& event) { DoStop(); - event.Skip(); + if (Core::GetState() == Core::CORE_UNINITIALIZED) + event.Skip(); } void CFrame::OnRenderParentMove(wxMoveEvent& event)