From 31e0f15797d0b6545ddc1a361252f267bf5d793d Mon Sep 17 00:00:00 2001 From: PoroCYon Date: Sun, 26 May 2019 00:37:51 +0200 Subject: fix oudated CMake compile settings, add OpenGL dependency for Linux --- src/CMakeLists.txt | 5 +++++ src/OpenGLSupport.cpp | 2 ++ src/libui_sdl/CMakeLists.txt | 2 ++ 3 files changed, 9 insertions(+) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4b1149f..72ae4bf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,8 +22,13 @@ add_library(core STATIC SPU.cpp Wifi.cpp WifiAP.cpp + # opengl backend stuff + GPU3D_OpenGL.cpp + OpenGLSupport.cpp ) if (WIN32) target_link_libraries(core ole32 comctl32 ws2_32) +else() + target_link_libraries(core OpenGL) endif() diff --git a/src/OpenGLSupport.cpp b/src/OpenGLSupport.cpp index 0204835..bb9e180 100644 --- a/src/OpenGLSupport.cpp +++ b/src/OpenGLSupport.cpp @@ -18,6 +18,8 @@ #include "OpenGLSupport.h" +#include + DO_PROCLIST(DECLPROC); diff --git a/src/libui_sdl/CMakeLists.txt b/src/libui_sdl/CMakeLists.txt index 40019db..0b7545b 100644 --- a/src/libui_sdl/CMakeLists.txt +++ b/src/libui_sdl/CMakeLists.txt @@ -10,6 +10,8 @@ SET(SOURCES_LIBUI DlgEmuSettings.cpp DlgInputConfig.cpp DlgWifiSettings.cpp + # opengl backend stuff + DlgVideoSettings.cpp ) option(BUILD_SHARED_LIBS "Whether to build libui as a shared library or a static library" ON) -- cgit v1.2.3