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

Linux cmake build fix. I fixed the scons build as well, so this might fix the macosx build also. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6424 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-11-16 00:13:33 +00:00
parent 0c5ccf7156
commit d0e8d8a509
8 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -212,6 +212,7 @@ include_directories(Source/Core/DSPCore/Src)
include_directories(Source/Core/InputCommon/Src)
include_directories(Source/Core/InputUICommon/Src)
include_directories(Source/Core/VideoCommon/Src)
include_directories(Source/Core/VideoUICommon/Src)
include_directories(Source/Core/wiiuse/Src)

1
SConstruct
View File

@ -358,6 +358,7 @@ dirs = [
'Source/Core/InputCommon/Src',
'Source/Core/InputUICommon/Src',
'Source/Core/VideoCommon/Src',
'Source/Core/VideoUICommon/Src',
'Source/Core/wiiuse/Src',
'Source/DSPTool/Src',
'Source/Plugins/Plugin_DSP_HLE/Src',

1
Source/Core/CMakeLists.txt
View File

@ -6,6 +6,7 @@ if(wxWidgets_FOUND)
add_subdirectory(DebuggerUICommon)
add_subdirectory(DebuggerWX)
add_subdirectory(InputUICommon)
add_subdirectory(VideoUICommon)
endif()
add_subdirectory(DiscIO)

6
Source/Core/VideoUICommon/CMakeLists.txt Normal file
View File

@ -0,0 +1,6 @@
set(SRCS Src/VideoConfigDiag.cpp)
add_library(videouicommon STATIC ${SRCS})
if(UNIX)
add_definitions(-fPIC)
endif(UNIX)

12
Source/Core/VideoUICommon/Src/SConscript Normal file
View File

@ -0,0 +1,12 @@
# -*- python -*-
Import('env')
if not env['HAVE_WX']:
Return()
files = [
'VideoConfigDiag.cpp',
]
env.StaticLibrary(env['local_libs'] + 'videouicommon', files)

6
Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp
View File

@ -10,22 +10,24 @@ template class BoolSetting<wxRadioButton>;
typedef BoolSetting<wxCheckBox> SettingCheckBox;
typedef BoolSetting<wxRadioButton> SettingRadioButton;
template <>
SettingCheckBox::BoolSetting(wxWindow* parent, const wxString& label, bool &setting, bool reverse, long style)
: wxCheckBox(parent, -1, label, wxDefaultPosition, wxDefaultSize, style)
, m_setting(setting)
, m_reverse(reverse)
{
SetValue(m_setting ^ m_reverse);
_connect_macro_(this, BoolSetting<W>::UpdateValue, wxEVT_COMMAND_CHECKBOX_CLICKED, this);
_connect_macro_(this, SettingCheckBox::UpdateValue, wxEVT_COMMAND_CHECKBOX_CLICKED, this);
}
template <>
SettingRadioButton::BoolSetting(wxWindow* parent, const wxString& label, bool &setting, bool reverse, long style)
: wxRadioButton(parent, -1, label, wxDefaultPosition, wxDefaultSize, style)
, m_setting(setting)
, m_reverse(reverse)
{
SetValue(m_setting ^ m_reverse);
_connect_macro_(this, BoolSetting<W>::UpdateValue, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this);
_connect_macro_(this, SettingRadioButton::UpdateValue, wxEVT_COMMAND_RADIOBUTTON_SELECTED, this);
}
SettingChoice::SettingChoice(wxWindow* parent, int &setting, int num, const wxString choices[])

1
Source/Plugins/Plugin_VideoOGL/CMakeLists.txt
View File

@ -13,6 +13,7 @@ set(SRCS Src/BPFunctions.cpp
Src/VertexManager.cpp)
set(LIBS videocommon
videouicommon
GLEW
SOIL
common

2
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -22,7 +22,7 @@ files = [
'GLUtil.cpp'
]
libs = [ 'videocommon', 'GLEW', 'SOIL', 'common' ]
libs = [ 'videocommon', 'videouicommon', 'GLEW', 'SOIL', 'common' ]
if env['HAVE_WX']:
files += [