From df42b279ed8d9366beff3cf6c7fc82d286d30f8c Mon Sep 17 00:00:00 2001
From: skidau <skidau@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Sat, 9 May 2015 14:09:29 +0000
Subject: [PATCH] Removed an extraneous include and added a SDL build check in
 the CMakeLists.txt

---
 CMakeLists.txt   | 4 ++--
 src/wx/panel.cpp | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8c8ba11..6099202f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,9 +51,9 @@ ENDIF( NOT VERSION )
 
 # Fill in SDLMAIN_LIBRARY on OS X manually to avoid using SDLMain.m
 # OS X users will have to compile and install SDL from source.
-if( APPLE )
+if( APPLE AND ENABLE_SDL )
     SET(SDLMAIN_LIBRARY "-lSDLmain")
-endif( APPLE )
+endif( APPLE AND ENABLE_SDL )
 
 # Check for nasm
 if( ENABLE_ASM_SCALERS )
diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index 3ea4433e..d2f53b39 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -1662,7 +1662,6 @@ void BasicDrawingPanel::DrawArea(wxWindowDC &dc)
 }
 
 #ifndef NO_OGL
-#include <GL/glext.h> // for 16-bit texture data formats on win32
 // following 3 for vsync
 #ifdef __WXMAC__
 #include <OpenGL/OpenGL.h>