Merge pull request #3705 from Mystro256/master

Various Linux fixes
This commit is contained in:
Pierre Bourdon 2016-03-11 22:31:58 +01:00
commit c008d8b1af
7 changed files with 134 additions and 6 deletions

View File

@ -7,6 +7,7 @@ project(dolphin-emu)
option(USE_EGL "Enables EGL OpenGL Interface" OFF) option(USE_EGL "Enables EGL OpenGL Interface" OFF)
option(TRY_X11 "Enables X11 Support" ON) option(TRY_X11 "Enables X11 Support" ON)
option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF) option(USE_SHARED_ENET "Use shared libenet if found rather than Dolphin's soon-to-compatibly-diverge version" OFF)
option(USE_SHARED_GTEST "Use shared gtest library if found" OFF)
option(USE_UPNP "Enables UPnP port mapping support" ON) option(USE_UPNP "Enables UPnP port mapping support" ON)
option(DISABLE_WX "Disable wxWidgets (use Qt or CLI interface)" OFF) option(DISABLE_WX "Disable wxWidgets (use Qt or CLI interface)" OFF)
option(ENABLE_QT2 "Enable Qt2 (use the other experimental Qt interface)" OFF) option(ENABLE_QT2 "Enable Qt2 (use the other experimental Qt interface)" OFF)
@ -906,8 +907,15 @@ include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common")
######################################## ########################################
# Unit testing. # Unit testing.
# #
include_directories(Externals/gtest/include) include(FindGTest)
add_subdirectory(Externals/gtest) if(GTEST_FOUND AND USE_SHARED_GTEST)
message("Using shared gtest")
include_directories(${GTEST_INCLUDE_DIRS})
else()
message("Using static gtest from Externals")
include_directories(Externals/gtest/include)
add_subdirectory(Externals/gtest)
endif(GTEST_FOUND)
enable_testing() enable_testing()
add_custom_target(unittests) add_custom_target(unittests)
@ -946,12 +954,17 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")
endif() endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
# Install the application icon and menu item # Install the application icon and menu item
install(FILES Installer/dolphin-emu.svg install(FILES Data/dolphin-emu.svg
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps) DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
install(FILES Installer/dolphin-emu.png install(FILES Data/dolphin-emu.png
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps) DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps)
install(FILES Installer/dolphin-emu.desktop install(FILES Data/dolphin-emu.desktop
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
# Install manpages
install(FILES Data/dolphin-emu.6
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
install(FILES Data/dolphin-emu-nogui.6
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
endif() endif()
# packaging information # packaging information

56
Data/dolphin-emu-nogui.6 Normal file
View File

@ -0,0 +1,56 @@
.TH DOLPHIN-EMU-NOGUI 6 "March 4, 2016"
.SH NAME
dolphin-emu-nogui - an emulator for running GameCube, Wii, and Triforce
games on
Windows, Linux, OS X, and recent Android devices.
.SH SYNOPSIS
.B dolphin-emu-nogui
[\fB-h\fR] [\fB-d\fR] [\fB-l\fR] [\fB-e \fIfile\fR] [\fB-b\fR] [\fB-c\fR] [\fB-V
\fIvideo\fR] [\fB-A \fIaudio\fR] [\fB-m
\fIfile\fR] [\fB-u \fIpath\fR]
.SH DESCRIPTION
Dolphin is an emulator for two recent Nintendo video game consoles: the
GameCube and the Wii. It allows PC gamers to enjoy games for these two consoles
in full HD (1080p) with several enhancements: compatibility with all PC
controllers, turbo speed, networked multiplayer, and even more!
.P
\fBdolphin-emu-nogui\fR does not have a graphical user interface.
.SH OPTIONS
.TP
.BR \-h ", " \-\-help
Show this help message
.TP
.BR \-d ", " \-\-debugger
Opens the debugger
.TP
.BR \-l ", " \-\-logger
Opens the logger
.TP
.BR \-e ", " \-\-exec =\fIfile\fR
Loads the specified file
(\fBDOL\fR,\fBELF\fR,\fBWAD\fR,\fBGCM\fR,\fBISO\fR)
.TP
.BR \-b ", " \-\-batch
Exit Dolphin with emulator
.TP
.BR \-c ", " \-\-confirm =\fItext\fR
Set Confirm on Stop
.TP
.BR \-V ", " \-\-video_backend =\fIvideo\fR
OpenGL (\fBOGL\fR) or \fBSoftware Renderer\fR video backend
.TP
.BR \-A ", " \-\-audio_emulation =\fIaudio\fR
Low level (\fBLLE\fR) or high level (\fBHLE\fR) audio
.TP
.BR \-m ", " \-\-movie =\fIfile\fR
Play a movie file
.TP
.BR \-u ", " \-\-user =\fIpath\fR
User folder path
.SH FILES
.TP
.I $HOME/.dolphin-emu
Default user configuration directory.
.SH AUTHOR
This manual page was written by Jeremy Newton, but may be distributed freely
using the CC BY license.

56
Data/dolphin-emu.6 Normal file
View File

@ -0,0 +1,56 @@
.TH DOLPHIN-EMU 6 "March 4, 2016"
.SH NAME
dolphin-emu - an emulator for running GameCube, Wii, and Triforce
games on
Windows, Linux, OS X, and recent Android devices.
.SH SYNOPSIS
.B dolphin-emu
[\fB-h\fR] [\fB-d\fR] [\fB-l\fR] [\fB-e \fIfile\fR] [\fB-b\fR] [\fB-c\fR] [\fB-V
\fIvideo\fR] [\fB-A \fIaudio\fR] [\fB-m
\fIfile\fR] [\fB-u \fIpath\fR]
.SH DESCRIPTION
Dolphin is an emulator for two recent Nintendo video game consoles: the
GameCube and the Wii. It allows PC gamers to enjoy games for these two consoles
in full HD (1080p) with several enhancements: compatibility with all PC
controllers, turbo speed, networked multiplayer, and even more!
.P
\fBdolphin-emu\fR features a graphical user interface made using wxWidgets.
.SH OPTIONS
.TP
.BR \-h ", " \-\-help
Show this help message
.TP
.BR \-d ", " \-\-debugger
Opens the debugger
.TP
.BR \-l ", " \-\-logger
Opens the logger
.TP
.BR \-e ", " \-\-exec =\fIfile\fR
Loads the specified file
(\fBDOL\fR,\fBELF\fR,\fBWAD\fR,\fBGCM\fR,\fBISO\fR)
.TP
.BR \-b ", " \-\-batch
Exit Dolphin with emulator
.TP
.BR \-c ", " \-\-confirm =\fItext\fR
Set Confirm on Stop
.TP
.BR \-V ", " \-\-video_backend =\fIvideo\fR
OpenGL (\fBOGL\fR) or \fBSoftware Renderer\fR video backend
.TP
.BR \-A ", " \-\-audio_emulation =\fIaudio\fR
Low level (\fBLLE\fR) or high level (\fBHLE\fR) audio
.TP
.BR \-m ", " \-\-movie =\fIfile\fR
Play a movie file
.TP
.BR \-u ", " \-\-user =\fIpath\fR
User folder path
.SH FILES
.TP
.I $HOME/.dolphin-emu
Default user configuration directory.
.SH AUTHOR
This manual page was written by Jeremy Newton, but may be distributed freely
using the CC BY license.

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -56,7 +56,8 @@ BuildRequires: lzo-devel
# Disable miniupnpc in OBS for F20 # Disable miniupnpc in OBS for F20
BuildRequires: miniupnpc-devel BuildRequires: miniupnpc-devel
BuildRequires: openal-soft-devel BuildRequires: openal-soft-devel
BuildRequires: polarssl-devel #polarssl is now mbedtls:
BuildRequires: mbedtls-devel
BuildRequires: portaudio-devel BuildRequires: portaudio-devel
BuildRequires: SDL2-devel BuildRequires: SDL2-devel
BuildRequires: SFML-devel BuildRequires: SFML-devel
@ -110,6 +111,7 @@ Dolphin Emulator without a graphical user interface
%files nogui %files nogui
%{_bindir}/%{name}-nogui %{_bindir}/%{name}-nogui
%{_mandir}/man6/%{name}-nogui.*
# ------------------------------------------------------ # ------------------------------------------------------
@ -138,6 +140,7 @@ make %{?_smp_mflags} install DESTDIR="%{?buildroot}"
%{_datadir}/%{name} %{_datadir}/%{name}
%{_datadir}/pixmaps/dolphin-emu.xpm %{_datadir}/pixmaps/dolphin-emu.xpm
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_mandir}/man6/%{name}.*
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}