diff options
| author | PoroCYon <pcy@national.shitposting.agency> | 2019-05-26 00:37:51 +0200 |
|---|---|---|
| committer | PoroCYon <pcy@national.shitposting.agency> | 2019-05-26 00:37:51 +0200 |
| commit | 31e0f15797d0b6545ddc1a361252f267bf5d793d (patch) | |
| tree | 0c85109357a0e64b72f6a80b16bcad67a399d54f | |
| parent | 99dbbb0b0464d91ed07ffd67c0b6ef83bc6a293e (diff) | |
fix oudated CMake compile settings, add OpenGL dependency for Linux
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/OpenGLSupport.cpp | 2 | ||||
| -rw-r--r-- | src/libui_sdl/CMakeLists.txt | 2 |
4 files changed, 10 insertions, 0 deletions
@@ -5,3 +5,4 @@ obj *.o melon_grc.c melon_grc.h +cmake-build 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 <cstring> + 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) |