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

gsdx: linux compilation fix. Gcc don't support same name for variable and template parameter 

cmake: compilation fix on debian sid (and potentially ubuntu)
i18n: add some comment for potential language change in the future.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5088 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2012-02-06 18:16:49 +00:00
parent fb96f1d928
commit 4593b6ac52
4 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -57,7 +57,11 @@ include(SelectPcsx2Plugins)
# add additional project-wide include directories # add additional project-wide include directories
include_directories(${PROJECT_SOURCE_DIR}/common/include include_directories(${PROJECT_SOURCE_DIR}/common/include
${PROJECT_SOURCE_DIR}/common/include/Utilities ${PROJECT_SOURCE_DIR}/common/include/Utilities
${PROJECT_SOURCE_DIR}/common/include/x86emitter) ${PROJECT_SOURCE_DIR}/common/include/x86emitter
# WORKAROUND Some issue with multiarch on Debian/Ubuntu
/usr/include/i386-linux-gnu
/usr/include/x86_64-linux-gnu
)
# make the translation # make the translation
if(EXISTS "${PROJECT_SOURCE_DIR}/locales") if(EXISTS "${PROJECT_SOURCE_DIR}/locales")

27
pcsx2/gui/i18n.cpp
View File

@ -169,6 +169,11 @@ static wxLanguage i18n_FallbackToAnotherLang( wxLanguage wxLangId )
case wxLANGUAGE_CHINESE_SINGAPORE : return wxLANGUAGE_CHINESE_SIMPLIFIED; case wxLANGUAGE_CHINESE_SINGAPORE : return wxLANGUAGE_CHINESE_SIMPLIFIED;
case wxLANGUAGE_SAMI : case wxLANGUAGE_SAMI :
// The correct fallback for Sami would be
// however, currently wxWidgets (2.9.3) only supports wxLANGUAGE_SAMI.
// case: wxLANGUAGE_SAMI_LULE_SWEDEN :
// case: wxLANGUAGE_SAMI_NORTHERN_SWEDEN :
// case: wxLANGUAGE_SAMI_SOUTHERN_SWEDEN :
case wxLANGUAGE_SWEDISH_FINLAND : return wxLANGUAGE_SWEDISH; case wxLANGUAGE_SWEDISH_FINLAND : return wxLANGUAGE_SWEDISH;
case wxLANGUAGE_PORTUGUESE : return wxLANGUAGE_PORTUGUESE_BRAZILIAN; case wxLANGUAGE_PORTUGUESE : return wxLANGUAGE_PORTUGUESE_BRAZILIAN;
@ -178,8 +183,30 @@ static wxLanguage i18n_FallbackToAnotherLang( wxLanguage wxLangId )
case wxLANGUAGE_GERMAN_BELGIUM : case wxLANGUAGE_GERMAN_BELGIUM :
case wxLANGUAGE_GERMAN_LIECHTENSTEIN : case wxLANGUAGE_GERMAN_LIECHTENSTEIN :
case wxLANGUAGE_GERMAN_LUXEMBOURG : case wxLANGUAGE_GERMAN_LUXEMBOURG :
// Currently wxWidgets (2.9.3) doesn't support Sorbian.
// case wxLANGUAGE_LOWER_SORBIAN :
// case wxLANGUAGE_UPPER_SORBIAN :
case wxLANGUAGE_GERMAN_SWISS : return wxLANGUAGE_GERMAN; case wxLANGUAGE_GERMAN_SWISS : return wxLANGUAGE_GERMAN;
case wxLANGUAGE_SPANISH_ARGENTINA:
case wxLANGUAGE_SPANISH_BOLIVIA:
case wxLANGUAGE_SPANISH_CHILE:
case wxLANGUAGE_SPANISH_COLOMBIA:
case wxLANGUAGE_SPANISH_COSTA_RICA:
case wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC:
case wxLANGUAGE_SPANISH_ECUADOR:
case wxLANGUAGE_SPANISH_EL_SALVADOR:
case wxLANGUAGE_SPANISH_GUATEMALA:
case wxLANGUAGE_SPANISH_HONDURAS:
case wxLANGUAGE_SPANISH_MEXICAN:
case wxLANGUAGE_SPANISH_NICARAGUA:
case wxLANGUAGE_SPANISH_PANAMA:
case wxLANGUAGE_SPANISH_PARAGUAY:
case wxLANGUAGE_SPANISH_PERU:
case wxLANGUAGE_SPANISH_PUERTO_RICO:
case wxLANGUAGE_SPANISH_URUGUAY:
case wxLANGUAGE_SPANISH_VENEZUELA: return wxLANGUAGE_SPANISH_MODERN;
case wxLANGUAGE_ITALIAN_SWISS : return wxLANGUAGE_ITALIAN; case wxLANGUAGE_ITALIAN_SWISS : return wxLANGUAGE_ITALIAN;
default : break; default : break;

4
plugins/GSdx/CMakeLists.txt
View File

@ -96,10 +96,6 @@ set(GSdxSources
GSUtil.cpp GSUtil.cpp
GSVector.cpp GSVector.cpp
GSVertexTrace.cpp GSVertexTrace.cpp
GSVertexTrace.x64.avx.cpp
GSVertexTrace.x86.cpp
GSVertexTrace.x86.avx.cpp
GSVertexTrace.x64.cpp
GSWnd.cpp GSWnd.cpp
GSdx.cpp GSdx.cpp
stdafx.cpp stdafx.cpp

2
plugins/GSdx/GSState.cpp
View File

@ -746,7 +746,7 @@ template<int i> void GSState::ApplyTEX0(GIFRegTEX0& TEX0)
blocks >>= 1; blocks >>= 1;
} }
for(int i = 0; i < blocks; i++, BITBLTBUF.SBP++) for(int j = 0; j < blocks; j++, BITBLTBUF.SBP++)
{ {
InvalidateLocalMem(BITBLTBUF, r, true); InvalidateLocalMem(BITBLTBUF, r, true);
} }