Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

VideoOGL: Move X11 wxWidgets utilities to DolphinWX #1589

Merged
merged 1 commit into from
Nov 25, 2014
Merged

VideoOGL: Move X11 wxWidgets utilities to DolphinWX #1589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions Source/Core/DolphinWX/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ set(GUI_SRCS
WiimoteConfigDiag.cpp
WxUtils.cpp)

set(NOGUI_SRCS MainNoGUI.cpp)

if(USE_X11)
set(GUI_SRCS ${GUI_SRCS} X11Utils.cpp)

This comment was marked as off-topic.

Sign in to view

set(NOGUI_SRCS ${NOGUI_SRCS} X11Utils.cpp)
endif()

set(WXLIBS ${wxWidgets_LIBRARIES} dl)

list(APPEND LIBS core uicommon)
Expand All @@ -56,12 +63,9 @@ if(ANDROID)
list(APPEND LIBS png)
endif()


set(ANDROID_SRCS Android/ButtonManager.cpp
MainAndroid.cpp)

set(NOGUI_SRCS MainNoGUI.cpp)

if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(wxWidgets_FOUND)
list(APPEND WXLIBS
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/ConfigMain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "Common/CommonTypes.h"
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#include "VideoBackends/OGL/GLInterface/X11Utils.h"
#include "DolphinWX/X11Utils.h"
#endif

class wxBoxSizer;
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/Frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "InputCommon/GCPadStatus.h"

#if defined(HAVE_X11) && HAVE_X11
#include "VideoBackends/OGL/GLInterface/X11Utils.h"
#include "DolphinWX/X11Utils.h"
#endif

// Class declarations
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinWX/MainNoGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void Host_ShowVideoConfig(void*, const std::string&, const std::string&) {}

#if HAVE_X11
#include <X11/keysym.h>
#include "VideoBackends/OGL/GLInterface/X11Utils.h"
#include "DolphinWX/X11Utils.h"

class PlatformX11 : public Platform
{
Expand Down
2 changes: 1 addition & 1 deletion ...ideoBackends/OGL/GLInterface/X11Utils.cpp → Source/Core/DolphinWX/X11Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreParameter.h"
#include "VideoBackends/OGL/GLInterface/X11Utils.h"
#include "DolphinWX/X11Utils.h"

extern char **environ;

Expand Down
0 .../VideoBackends/OGL/GLInterface/X11Utils.h → Source/Core/DolphinWX/X11Utils.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Source/Core/VideoBackends/OGL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ elseif(USE_X11)
# Make sure to link to it if using GLX.
set(LIBS ${LIBS} ${OPENGL_LIBRARIES})
endif()
set(SRCS ${SRCS} GLInterface/X11_Util.cpp GLInterface/X11Utils.cpp)
set(SRCS ${SRCS} GLInterface/X11_Util.cpp)
set(LIBS ${LIBS} ${XRANDR_LIBRARIES})
endif()

Expand Down