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

Do commits 2bc2047 and f287754 the right way ...

This commit is contained in:
Johannes Obermayr 2014-09-14 18:41:26 +02:00
parent e59c9b0e65
commit 7b1d3ba7ea
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -96,7 +96,15 @@ if(PACKAGE_MODE)
INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/cheats_ws.zip" DESTINATION "${GAMEINDEX_DIR}") INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/cheats_ws.zip" DESTINATION "${GAMEINDEX_DIR}")
INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION "${GAMEINDEX_DIR}") INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION "${GAMEINDEX_DIR}")
INSTALL(FILES "${CMAKE_SOURCE_DIR}/linux_various/pcsx2.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications") # set categories depending on system/distribution in pcsx2.desktop
if(openSUSE)
set(PCSX2_MENU_CATEGORIES "System;Emulator;")
else()
set(PCSX2_MENU_CATEGORIES "Game;Emulator;")
endif()
configure_file("${CMAKE_SOURCE_DIR}/linux_various/pcsx2.desktop.in" "${CMAKE_BINARY_DIR}/linux_various/pcsx2.desktop" @ONLY)
INSTALL(FILES "${CMAKE_BINARY_DIR}/linux_various/pcsx2.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
INSTALL(FILES "${CMAKE_SOURCE_DIR}/linux_various/pcsx2.xpm" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps") INSTALL(FILES "${CMAKE_SOURCE_DIR}/linux_various/pcsx2.xpm" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps")
INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/docs/PCSX2_FAQ.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2") INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/docs/PCSX2_FAQ.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2")
INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/docs/PCSX2_Readme.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2") INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/docs/PCSX2_Readme.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2")

4
cmake/Pcsx2Utils.cmake
View File

@ -22,9 +22,11 @@ function(detectOperatingSystem)
file(STRINGS /etc/os-release OS_RELEASE) file(STRINGS /etc/os-release OS_RELEASE)
if ("${OS_RELEASE}" MATCHES "^.*ID=fedora.*$") if ("${OS_RELEASE}" MATCHES "^.*ID=fedora.*$")
set(Fedora TRUE PARENT_SCOPE) set(Fedora TRUE PARENT_SCOPE)
message(STATUS "Build Fedora specific")
endif() endif()
if ("${OS_RELEASE}" MATCHES "^.*ID=.*suse.*$") if ("${OS_RELEASE}" MATCHES "^.*ID=.*suse.*$")
set(OpenSuse TRUE PARENT_SCOPE) set(openSUSE TRUE PARENT_SCOPE)
message(STATUS "Build openSUSE specific")
endif() endif()
endif() endif()
endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

2
linux_various/pcsx2.desktop → linux_various/pcsx2.desktop.in
View File

@ -7,4 +7,4 @@ GenericName=Playstation 2 Emulator
Comment=Sony Playstation 2 emulator Comment=Sony Playstation 2 emulator
Exec=pcsx2 Exec=pcsx2
Icon=pcsx2 Icon=pcsx2
Categories=Game;Emulator; Categories=@PCSX2_MENU_CATEGORIES@

10
linux_various/pcsx2_system.desktop
View File

@ -1,10 +0,0 @@
[Desktop Entry]
Version=1.0
Terminal=false
Type=Application
Name=PCSX2
GenericName=Playstation 2 Emulator
Comment=Sony Playstation 2 emulator
Exec=pcsx2
Icon=pcsx2
Categories=System;Emulator;

4
pcsx2/CMakeLists.txt
View File

@ -1,5 +1,5 @@
if (OpenSuse) if (openSUSE)
# OpenSuse don't install wx in a standard library system # openSUSE don't install wx in a standard library system
# path. Let's bypass the dynamic linker and hardcode the path. # path. Let's bypass the dynamic linker and hardcode the path.
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
endif() endif()

4
plugins/spu2-x/src/CMakeLists.txt
View File

@ -1,5 +1,5 @@
if (OpenSuse) if (openSUSE)
# OpenSuse don't install wx in a standard library system # openSUSE don't install wx in a standard library system
# path. Let's bypass the dynamic linker and hardcode the path. # path. Let's bypass the dynamic linker and hardcode the path.
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
endif() endif()

4
plugins/zzogl-pg/opengl/CMakeLists.txt
View File

@ -1,5 +1,5 @@
if (OpenSuse) if (openSUSE)
# OpenSuse don't install wx in a standard library system # openSUSE don't install wx in a standard library system
# path. Let's bypass the dynamic linker and hardcode the path. # path. Let's bypass the dynamic linker and hardcode the path.
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
endif() endif()