fix oudated CMake compile settings, add OpenGL dependency for Linux

This commit is contained in:
PoroCYon 2019-05-26 00:37:51 +02:00
parent 99dbbb0b04
commit 31e0f15797
4 changed files with 10 additions and 0 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ obj
*.o *.o
melon_grc.c melon_grc.c
melon_grc.h melon_grc.h
cmake-build

View File

@ -22,8 +22,13 @@ add_library(core STATIC
SPU.cpp SPU.cpp
Wifi.cpp Wifi.cpp
WifiAP.cpp WifiAP.cpp
# opengl backend stuff
GPU3D_OpenGL.cpp
OpenGLSupport.cpp
) )
if (WIN32) if (WIN32)
target_link_libraries(core ole32 comctl32 ws2_32) target_link_libraries(core ole32 comctl32 ws2_32)
else()
target_link_libraries(core OpenGL)
endif() endif()

View File

@ -18,6 +18,8 @@
#include "OpenGLSupport.h" #include "OpenGLSupport.h"
#include <cstring>
DO_PROCLIST(DECLPROC); DO_PROCLIST(DECLPROC);

View File

@ -10,6 +10,8 @@ SET(SOURCES_LIBUI
DlgEmuSettings.cpp DlgEmuSettings.cpp
DlgInputConfig.cpp DlgInputConfig.cpp
DlgWifiSettings.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) option(BUILD_SHARED_LIBS "Whether to build libui as a shared library or a static library" ON)