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

[pcsx2 ui]: update Game fixes panel to look like speed hack one 

[spu2x]: explain why one inline fail on linux
[cmake]: Prepare some include directory updates


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3185 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2010-06-08 17:08:00 +00:00
parent 91454bfb12
commit aa430319c0
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindSoundTouch.cmake
View File

@ -10,7 +10,7 @@ if(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES)
endif(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES) endif(SOUNDTOUCH_INCLUDE_DIR AND SOUNDTOUCH_LIBRARIES)
# include dir # include dir
find_path(SOUNDTOUCH_INCLUDE_DIR soundtouch/SoundTouch.h) find_path(SOUNDTOUCH_INCLUDE_DIR SoundTouch.h)
# finally the library itself # finally the library itself
find_library(libSoundTouch NAMES SoundTouch) find_library(libSoundTouch NAMES SoundTouch)

5
cmake/SearchForStuff.cmake
View File

@ -64,9 +64,7 @@ if(NOT SOUNDTOUCH_FOUND OR FORCE_INTERNAL_SOUNDTOUCH)
set(SOUNDTOUCH_FOUND TRUE) set(SOUNDTOUCH_FOUND TRUE)
# Set path # Set path
set(SOUNDTOUCH_LIBRARIES SoundTouch) set(SOUNDTOUCH_LIBRARIES SoundTouch)
# XXX Need to be updated when repository will be updated include_directories(${PROJECT_SOURCE_DIR}/3rdparty/SoundTouch)
# For the moment include are done with the last fallback in bottom of the file
# include_directories(${PROJECT_SOURCE_DIR}/3rdparty/soundtouch_internal)
endif(NOT SOUNDTOUCH_FOUND OR FORCE_INTERNAL_SOUNDTOUCH) endif(NOT SOUNDTOUCH_FOUND OR FORCE_INTERNAL_SOUNDTOUCH)
if(NOT A52_FOUND OR FORCE_INTERNAL_A52) if(NOT A52_FOUND OR FORCE_INTERNAL_A52)
@ -170,4 +168,5 @@ endif(ZLIB_FOUND AND NOT projectZLIB)
#---------------------------------------- #----------------------------------------
# In all others situation fallback to the 3rdparty # In all others situation fallback to the 3rdparty
#---------------------------------------- #----------------------------------------
# XXX Must be delete when all include will be fixed
include_directories(${PROJECT_SOURCE_DIR}/3rdparty) include_directories(${PROJECT_SOURCE_DIR}/3rdparty)

21
pcsx2/gui/Panels/GameFixesPanel.cpp
View File

@ -83,20 +83,19 @@ Panels::GameFixesPanel::GameFixesPanel( wxWindow* parent )
} }
m_check_Enable = new pxCheckBox( this, _("Enable game fixes"), m_check_Enable = new pxCheckBox( this, _("Enable game fixes"),
_("(Warning! Game fixes can cause compatibility or performance issues!)"));
m_check_Enable->SetToolTip(_("The safest way to make sure that all game fixes are completely disabled."));
m_check_Enable->SetValue( g_Conf->EnableGameFixes );
*this += Heading(_("Some games need special settings.\nEnable them here.")).Bold() | StdExpand();
*this += groupSizer | pxCenter;
*this += m_check_Enable | StdExpand();
*this += Heading(
pxE( ".Panel:Gamefixes:Compat Warning", pxE( ".Panel:Gamefixes:Compat Warning",
L"Enabling game fixes can cause compatibility or performance issues in other games. You " L"Gamefixes can fix wrong emulation in some games. However "
L"it can cause compatibility or performance issues in other games. You "
L"will need to turn off fixes manually when changing games." L"will need to turn off fixes manually when changing games."
) )
) | StdExpand(); );
m_check_Enable->SetToolTip(_("The safest way to make sure that all game fixes are completely disabled.")).SetSubPadding( 1 );
m_check_Enable->SetValue( g_Conf->EnableGameFixes );
*this += m_check_Enable | StdExpand();
*this += groupSizer | pxCenter;
Connect( m_check_Enable->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( GameFixesPanel::OnEnable_Toggled ) ); Connect( m_check_Enable->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( GameFixesPanel::OnEnable_Toggled ) );

8
plugins/spu2-x/src/Mixer.cpp
View File

@ -57,7 +57,13 @@ __forceinline s32 clamp_mix( s32 x, u8 bitshift )
} }
#if _MSC_VER #if _MSC_VER
__forceinline // gcc forceinline fails here... ? __forceinline
// Without the keyword static, gcc compilation fails on the inlining...
// Unfortunately the function is also used in Reverb.cpp. In order to keep the code
// clean we just disable it.
// We will need link-time code generation / Whole Program optimization to do a clean
// inline. Gcc 4.5 has the experimental options -flto, -fwhopr and -fwhole-program to
// do it but it still experimental...
#endif #endif
StereoOut32 clamp_mix( const StereoOut32& sample, u8 bitshift ) StereoOut32 clamp_mix( const StereoOut32& sample, u8 bitshift )
{ {