Removed an extraneous include and added a SDL build check in the CMakeLists.txt

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 )

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>