mirror of https://github.com/PCSX2/pcsx2.git
Merge pull request #286 from jobermayr/master
Two patches from openSUSE / Packman
This commit is contained in:
Gregory Hainaut
commit
9656fad0f5
|
|
@ -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/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}/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")
|
||||
|
|
|
|||
|
|
@ -22,9 +22,12 @@ function(detectOperatingSystem)
|
|||
file(STRINGS /etc/os-release OS_RELEASE)
|
||||
if ("${OS_RELEASE}" MATCHES "^.*ID=fedora.*$")
|
||||
set(Fedora TRUE PARENT_SCOPE)
|
||||
message(STATUS "Build Fedora specific")
|
||||
endif()
|
||||
if ("${OS_RELEASE}" MATCHES "^.*ID=.*suse.*$")
|
||||
set(OpenSuse TRUE PARENT_SCOPE)
|
||||
set(openSUSE TRUE PARENT_SCOPE)
|
||||
add_definitions(-DopenSUSE)
|
||||
message(STATUS "Build openSUSE specific")
|
||||
endif()
|
||||
endif()
|
||||
endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@ GenericName=Playstation 2 Emulator
|
|||
Comment=Sony Playstation 2 emulator
|
||||
Exec=pcsx2
|
||||
Icon=pcsx2
|
||||
Categories=Game;Emulator;
|
||||
Categories=@PCSX2_MENU_CATEGORIES@
|
||||
|
|
@ -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;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
if (OpenSuse)
|
||||
# OpenSuse don't install wx in a standard library system
|
||||
if (openSUSE)
|
||||
# openSUSE don't install wx in a standard library system
|
||||
# path. Let's bypass the dynamic linker and hardcode the path.
|
||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -194,14 +194,20 @@ void SysLogMachineCaps()
|
|||
{
|
||||
if ( !PCSX2_isReleaseVersion )
|
||||
{
|
||||
Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u-%lld %s - compiled on " __DATE__,
|
||||
PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
|
||||
Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u-%lld %s"
|
||||
#ifndef openSUSE
|
||||
"- compiled on " __DATE__
|
||||
#endif
|
||||
, PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
|
||||
SVN_REV, SVN_MODS ? "(modded)" : ""
|
||||
);
|
||||
}
|
||||
else { // shorter release version string
|
||||
Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u-%lld - compiled on " __DATE__,
|
||||
PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
|
||||
Console.WriteLn(Color_StrongGreen, "PCSX2 %u.%u.%u-%lld"
|
||||
#ifndef openSUSE
|
||||
"- compiled on " __DATE__
|
||||
#endif
|
||||
, PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
|
||||
SVN_REV );
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -356,8 +356,13 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
|
|||
else
|
||||
{
|
||||
// beta / development editions, which feature revision number and compile date.
|
||||
#ifndef openSUSE
|
||||
wintitle.Printf( L"%s %d.%d.%d-%lld%s (git) %s", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
|
||||
SVN_REV, SVN_MODS ? L"m" : wxEmptyString, fromUTF8(__DATE__).c_str() );
|
||||
#else
|
||||
wintitle.Printf( L"%s %d.%d.%d-%lld%s (git)", pxGetAppName().c_str(), PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo,
|
||||
SVN_REV, SVN_MODS ? L"m" : wxEmptyString );
|
||||
#endif
|
||||
}
|
||||
|
||||
SetTitle( wintitle );
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
if (OpenSuse)
|
||||
# OpenSuse don't install wx in a standard library system
|
||||
if (openSUSE)
|
||||
# openSUSE don't install wx in a standard library system
|
||||
# path. Let's bypass the dynamic linker and hardcode the path.
|
||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -32,10 +32,17 @@ static LRESULT WINAPI AboutProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
|
|||
|
||||
wchar_t outstr[256];
|
||||
if( IsDevBuild )
|
||||
swprintf_s( outstr, L"Build %lld -- Compiled on " _T(__DATE__), SVN_REV );
|
||||
swprintf_s( outstr, L"Build %lld"
|
||||
#ifndef openSUSE
|
||||
"-- Compiled on " _T(__DATE__)
|
||||
#endif
|
||||
, SVN_REV );
|
||||
else
|
||||
swprintf_s( outstr, L"Release v%d.%d -- Compiled on " _T(__DATE__),
|
||||
VersionInfo::Release, VersionInfo::Revision );
|
||||
swprintf_s( outstr, L"Release v%d.%d"
|
||||
#ifndef openSUSE
|
||||
"-- Compiled on " _T(__DATE__)
|
||||
#endif
|
||||
, VersionInfo::Release, VersionInfo::Revision );
|
||||
|
||||
SetWindowText( GetDlgItem(hDlg, IDC_LABEL_VERSION_INFO), outstr );
|
||||
ShowWindow( hDlg, true );
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
if (OpenSuse)
|
||||
# OpenSuse don't install wx in a standard library system
|
||||
if (openSUSE)
|
||||
# openSUSE don't install wx in a standard library system
|
||||
# path. Let's bypass the dynamic linker and hardcode the path.
|
||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Reference in New Issue