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

Merge pull request #7511 from stenzek/dolphin-no-gui-build 

CMake: Fix DolphinNoGUI build
This commit is contained in:
Mat M 2018-10-24 21:10:54 -04:00 committed by GitHub
parent dc5a678fca 8c84e27155
commit 748b275c9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Core.cpp
View File

@ -459,7 +459,7 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi
bool init_controllers = false;
if (!g_controller_interface.IsInit())
{
g_controller_interface.Initialize(wsi.display_connection);
g_controller_interface.Initialize(wsi.render_surface);
Pad::Initialize();
Keyboard::Initialize();
init_controllers = true;

2
Source/Core/DolphinNoGUI/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if(NOT(USE_X11 OR ENABLE_HEADLESS))
if(NOT((ENABLE_X11 AND X11_FOUND) OR ENABLE_HEADLESS))
return()
endif()