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

onepad: remember the pad selected (more user expected behavior) 

cmake: CDVDiso need gtk2, remove fatal error for 64bits fedora users


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4649 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-05-14 11:03:02 +00:00
parent 6f9ad58cdf
commit 8702685f73
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -12,6 +12,12 @@ set(TOP_CMAKE_WAS_SOURCED TRUE)
# Note: disable the failure in package mode
if(NOT PACKAGE_MODE)
if(CMAKE_SIZEOF_VOID_P MATCHES "8")
if (EXISTS /etc/fedora-release)
# Fedora users can install all .i686
message(STATUS "
Please ensure that you have all 32bits dependency installed (.i686 packages).
See http://code.google.com/p/pcsx2/wiki/ChrootAnd64bStatusLinux for more details.")
else (EXISTS /etc/fedora-release)
message(FATAL_ERROR "
PCSX2 does not support 64bits environment. Please install a 32bits chroot or a 32bits OS.
PCSX2 have neither no plan to support the 64bits architecture in the future.
@ -19,6 +25,7 @@ if(NOT PACKAGE_MODE)
However when linux distribution will support properly multi-arch package, it will
be at least possible to easily compile and install PCSX2 witout too much hassle (the chroot environment)")
endif (EXISTS /etc/fedora-release)
endif(CMAKE_SIZEOF_VOID_P MATCHES "8")
endif(NOT PACKAGE_MODE)

4
cmake/BuildParameters.cmake
View File

@ -147,6 +147,10 @@ endif(NOT DEFINED FORCE_INTERNAL_ZLIB)
if(NOT DEFINED FORCE_INTERNAL_SDL)
set(FORCE_INTERNAL_SDL FALSE)
endif(NOT DEFINED FORCE_INTERNAL_SDL)
if (FORCE_INTERNAL_SDL)
message(STATUS "Internal SDL is a development snapshot of libsdl 1.3
Crashes can be expected and no support will be provided")
endif (FORCE_INTERNAL_SDL)
#-------------------------------------------------------------------------------
# Select library system vs 3rdparty

4
cmake/SearchForStuff.cmake
View File

@ -37,8 +37,8 @@ if(NOT FORCE_INTERNAL_SDL)
find_package(SDL)
endif(NOT FORCE_INTERNAL_SDL)
find_package(Subversion)
# The requierement of wxWidgets is checked in SelectPcsx2Plugins module
# Does not requiere the module (allow to compile non-wx plugins)
# The requirement of wxWidgets is checked in SelectPcsx2Plugins module
# Does not require the module (allow to compile non-wx plugins)
# Force the unicode build (the variable is only supported on cmake 2.8.3 and above)
# Warning do not put any double-quote for the argument...
# set(wxWidgets_CONFIG_OPTIONS --unicode=yes --debug=yes) # In case someone want to debug inside wx

9
cmake/SelectPcsx2Plugins.cmake
View File

@ -3,7 +3,7 @@
#-------------------------------------------------------------------------------
set(msg_dep_common_libs "check these libraries -> wxWidgets (>=2.8.10), sparsehash (>=1.5)")
set(msg_dep_pcsx2 "check these libraries -> wxWidgets (>=2.8.10), gtk2 (>=2.16), zlib (>=1.2.4), pcsx2 common libs")
set(msg_dep_cdvdiso "check these libraries -> bzip2 (>=1.0.5)")
set(msg_dep_cdvdiso "check these libraries -> bzip2 (>=1.0.5), gtk2 (>=2.16)")
set(msg_dep_zerogs "check these libraries -> glew (>=1.5), opengl, X11, nvidia-cg-toolkit (>=2.1)")
set(msg_dep_gsdx "check these libraries -> opengl, X11, pcsx2 SDL")
set(msg_dep_zzogl "check these libraries -> glew (>=1.5), jpeg (>=6.2), opengl, X11, nvidia-cg-toolkit (>=2.1), pcsx2 common libs")
@ -73,14 +73,15 @@ set(CDVDnull TRUE)
# CDVDiso
#---------------------------------------
# requires: -BZip2
# -gtk2 (linux)
#---------------------------------------
if(BZIP2_FOUND)
if(BZIP2_FOUND AND GTK2_FOUND)
set(CDVDiso TRUE)
else(BZIP2_FOUND)
else(BZIP2_FOUND AND GTK2_FOUND)
set(CDVDiso FALSE)
message(STATUS "Skip build of CDVDiso: miss some dependencies")
message(STATUS "${msg_dep_cdvdiso}")
endif(BZIP2_FOUND)
endif(BZIP2_FOUND AND GTK2_FOUND)
#---------------------------------------
# CDVDlinuz

5
plugins/onepad/Linux/dialog.cpp
View File

@ -29,8 +29,8 @@ extern string KeyName(int pad, int key);
void config_key(int pad, int key);
void on_conf_key(GtkButton *button, gpointer user_data);
int current_pad = 0;
int current_joystick = -1;
static int current_pad = 0;
static int current_joystick = -1;
GtkWidget *rev_lx_check, *rev_ly_check, *force_feedback_check, *rev_rx_check, *rev_ry_check;
const char* s_pGuiKeyMap[] =
@ -477,7 +477,6 @@ void DisplayDialog()
dialog_buttons btn[29];
LoadConfig();
current_pad = 0;
fir = new keys_tree;
fir->init();