ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
skidau 2015-05-09 14:09:29 +00:00
parent 532a17a696
commit df42b279ed
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -51,9 +51,9 @@ ENDIF( NOT VERSION )
# Fill in SDLMAIN_LIBRARY on OS X manually to avoid using SDLMain.m # 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. # OS X users will have to compile and install SDL from source.
if( APPLE ) if( APPLE AND ENABLE_SDL )
SET(SDLMAIN_LIBRARY "-lSDLmain") SET(SDLMAIN_LIBRARY "-lSDLmain")
endif( APPLE ) endif( APPLE AND ENABLE_SDL )
# Check for nasm # Check for nasm
if( ENABLE_ASM_SCALERS ) if( ENABLE_ASM_SCALERS )

1
src/wx/panel.cpp
View File

@ -1662,7 +1662,6 @@ void BasicDrawingPanel::DrawArea(wxWindowDC &dc)
} }
#ifndef NO_OGL #ifndef NO_OGL
#include <GL/glext.h> // for 16-bit texture data formats on win32
// following 3 for vsync // following 3 for vsync
#ifdef __WXMAC__ #ifdef __WXMAC__
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>