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

[Build] Remove the OpenGL check 

This is no longer necessary with modern CMake.
This commit is contained in:
Fabrice de Gans 2024-03-18 16:29:46 -07:00 committed by Rafael Kitover
parent 6ac95d373f
commit a565cea8e9
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wx/CMakeLists.txt
View File

@ -285,8 +285,8 @@ if(VBAM_STATIC)
endif() endif()
find_package(wxWidgets COMPONENTS xrc xml html adv net core base gl) find_package(wxWidgets COMPONENTS xrc xml html adv net core base gl)
if(NOT wxWidgets_FOUND) if(NOT wxWidgets_FOUND)
set(WX_HAS_OPENGL FALSE)
find_package(wxWidgets COMPONENTS xrc xml html adv net core base REQUIRED) find_package(wxWidgets COMPONENTS xrc xml html adv net core base REQUIRED)
target_compile_definitions(visualboyadvance-m PRIVATE NO_OGL)
endif() endif()
target_link_libraries(visualboyadvance-m ${wxWidgets_LIBRARIES}) target_link_libraries(visualboyadvance-m ${wxWidgets_LIBRARIES})
@ -304,23 +304,6 @@ foreach(DEF ${wxWidgets_DEFINITIONS})
list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D${DEF}") list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D${DEF}")
endforeach() endforeach()
# Check for OpenGL.
include(CheckCXXSourceCompiles)
if(NOT DEFINED WX_HAS_OPENGL)
check_cxx_source_compiles("
#include <wx/wx.h>
#include <wx/config.h>
#include <wx/glcanvas.h>
int main(int argc, char** argv) {
wxGLCanvas canvas(NULL, wxID_ANY, NULL, wxPoint(0, 0), wxSize(300, 300), 0);
return 0;
}" WX_HAS_OPENGL)
endif()
if(NOT WX_HAS_OPENGL)
target_compile_definitions(visualboyadvance-m PRIVATE NO_OGL)
endif()
# we make some direct gtk/gdk calls on linux and such # we make some direct gtk/gdk calls on linux and such
# so need to link the gtk that wx was built with # so need to link the gtk that wx was built with
if(NOT WIN32 AND NOT APPLE) if(NOT WIN32 AND NOT APPLE)