aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/OpenGLSupport.cpp2
-rw-r--r--src/libui_sdl/CMakeLists.txt2
4 files changed, 10 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2d5b5f4..f63e239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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)