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

Fix the nogui build on linux. The software plugin config dialog should not be built. 

Fix the default wiimote emulation mouse button settings on linux.
Fix a little c++ operator precedence issue.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6534 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-12-05 18:10:13 +00:00
parent 8d9e1f2dd1
commit d171f7277b
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -851,8 +851,13 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
// TODO: finish this // TODO: finish this
// Buttons // Buttons
#ifdef __linux__
set_control(m_buttons, 0, "Click 1"); // A
set_control(m_buttons, 1, "Click 3"); // B
#else
set_control(m_buttons, 0, "Click 0"); // A set_control(m_buttons, 0, "Click 0"); // A
set_control(m_buttons, 1, "Click 1"); // B set_control(m_buttons, 1, "Click 1"); // B
#endif
//set_control(m_buttons, 2, ""); // 1 //set_control(m_buttons, 2, ""); // 1
//set_control(m_buttons, 3, ""); // 2 //set_control(m_buttons, 3, ""); // 2
//set_control(m_buttons, 4, ""); // - //set_control(m_buttons, 4, ""); // -

4
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
View File

@ -58,7 +58,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode)
for (int i = 0; i < 8; i += 2) for (int i = 0; i < 8; i += 2)
((u8*)&uid->values[1])[i / 2] = (bpmem.tevksel[i].hex & 0xf) | ((bpmem.tevksel[i + 1].hex & 0xf) << 4); ((u8*)&uid->values[1])[i / 2] = (bpmem.tevksel[i].hex & 0xf) | ((bpmem.tevksel[i + 1].hex & 0xf) << 4);
u32 enableZTexture = (bpmem.ztex2.op != (ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc) || g_ActiveConfig.bEnablePerPixelDepth)? 1 : 0; u32 enableZTexture = ((bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc) || g_ActiveConfig.bEnablePerPixelDepth)? 1 : 0;
uid->values[2] = (u32)bpmem.fog.c_proj_fsel.fsel | uid->values[2] = (u32)bpmem.fog.c_proj_fsel.fsel |
((u32)bpmem.fog.c_proj_fsel.proj << 3) | ((u32)bpmem.fog.c_proj_fsel.proj << 3) |
@ -466,7 +466,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt; nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
} }
} }
DepthTextureEnable = bpmem.ztex2.op != (ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc) || g_ActiveConfig.bEnablePerPixelDepth ; DepthTextureEnable = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.zcomploc) || g_ActiveConfig.bEnablePerPixelDepth ;
// Declare samplers // Declare samplers
if(ApiType != API_D3D11) if(ApiType != API_D3D11)

5
Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
View File

@ -22,9 +22,12 @@ set(SRCS Src/BPMemLoader.cpp
Src/VertexFormatConverter.cpp Src/VertexFormatConverter.cpp
Src/VertexLoader.cpp Src/VertexLoader.cpp
Src/VideoConfig.cpp Src/VideoConfig.cpp
Src/VideoConfigDialog.cpp
Src/XFMemLoader.cpp) Src/XFMemLoader.cpp)
if(wxWidgets_FOUND)
set(SRCS ${SRCS} Src/VideoConfigDialog.cpp)
endif(wxWidgets_FOUND)
set(LIBS videocommon set(LIBS videocommon
GLEW GLEW
SOIL SOIL