From 2e367fb052b777a51f4648ae77abe92473a90514 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Thu, 3 Mar 2016 22:55:44 -0500 Subject: [PATCH 1/4] Add option to use shared gtest library if available --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2538993c5..13b8424be3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ project(dolphin-emu) option(USE_EGL "Enables EGL OpenGL Interface" OFF) 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_GTEST "Use shared gtest library if found" OFF) option(USE_UPNP "Enables UPnP port mapping support" ON) option(DISABLE_WX "Disable wxWidgets (use Qt or CLI 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. # -include_directories(Externals/gtest/include) -add_subdirectory(Externals/gtest) +include(FindGTest) +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() add_custom_target(unittests) From 8d4607d29384b70a066d306c9612f41f9bcc1d0a Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Thu, 3 Mar 2016 23:03:53 -0500 Subject: [PATCH 2/4] Polarssl should be mbedtls in dolphin-emu.spec --- Installer/dolphin-emu.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Installer/dolphin-emu.spec b/Installer/dolphin-emu.spec index e666f3bd17..6c2338b731 100644 --- a/Installer/dolphin-emu.spec +++ b/Installer/dolphin-emu.spec @@ -56,7 +56,8 @@ BuildRequires: lzo-devel # Disable miniupnpc in OBS for F20 BuildRequires: miniupnpc-devel BuildRequires: openal-soft-devel -BuildRequires: polarssl-devel +#polarssl is now mbedtls: +BuildRequires: mbedtls-devel BuildRequires: portaudio-devel BuildRequires: SDL2-devel BuildRequires: SFML-devel From 84483a1076710666109bea3b4254b01e9d9f6f6b Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Thu, 3 Mar 2016 23:21:39 -0500 Subject: [PATCH 3/4] Add manpages for Linux and include them in spec file Note that the manpages are placed in Data --- CMakeLists.txt | 5 ++++ Data/dolphin-emu-nogui.6 | 56 ++++++++++++++++++++++++++++++++++++++ Data/dolphin-emu.6 | 56 ++++++++++++++++++++++++++++++++++++++ Installer/dolphin-emu.spec | 2 ++ 4 files changed, 119 insertions(+) create mode 100644 Data/dolphin-emu-nogui.6 create mode 100644 Data/dolphin-emu.6 diff --git a/CMakeLists.txt b/CMakeLists.txt index 13b8424be3..d28103cb45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -960,6 +960,11 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps) install(FILES Installer/dolphin-emu.desktop 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() # packaging information diff --git a/Data/dolphin-emu-nogui.6 b/Data/dolphin-emu-nogui.6 new file mode 100644 index 0000000000..f73a3fd817 --- /dev/null +++ b/Data/dolphin-emu-nogui.6 @@ -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. diff --git a/Data/dolphin-emu.6 b/Data/dolphin-emu.6 new file mode 100644 index 0000000000..9fd7b3429d --- /dev/null +++ b/Data/dolphin-emu.6 @@ -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. diff --git a/Installer/dolphin-emu.spec b/Installer/dolphin-emu.spec index 6c2338b731..053ab92f86 100644 --- a/Installer/dolphin-emu.spec +++ b/Installer/dolphin-emu.spec @@ -111,6 +111,7 @@ Dolphin Emulator without a graphical user interface %files nogui %{_bindir}/%{name}-nogui +%{_mandir}/man6/%{name}-nogui.* # ------------------------------------------------------ @@ -139,6 +140,7 @@ make %{?_smp_mflags} install DESTDIR="%{?buildroot}" %{_datadir}/%{name} %{_datadir}/pixmaps/dolphin-emu.xpm %{_datadir}/applications/%{name}.desktop +%{_mandir}/man6/%{name}.* %clean rm -rf %{buildroot} From feae5ff3d8061a8ce95584057b449b3905e69670 Mon Sep 17 00:00:00 2001 From: Jeremy Newton Date: Wed, 9 Mar 2016 10:54:17 -0500 Subject: [PATCH 4/4] Move linux files to Data --- CMakeLists.txt | 6 +++--- {Installer => Data}/dolphin-emu.desktop | 0 {Installer => Data}/dolphin-emu.png | Bin {Installer => Data}/dolphin-emu.svg | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {Installer => Data}/dolphin-emu.desktop (100%) rename {Installer => Data}/dolphin-emu.png (100%) rename {Installer => Data}/dolphin-emu.svg (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d28103cb45..9b822ca62c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -954,11 +954,11 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin") endif() if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") # 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) - install(FILES Installer/dolphin-emu.png + install(FILES Data/dolphin-emu.png 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) # Install manpages install(FILES Data/dolphin-emu.6 diff --git a/Installer/dolphin-emu.desktop b/Data/dolphin-emu.desktop similarity index 100% rename from Installer/dolphin-emu.desktop rename to Data/dolphin-emu.desktop diff --git a/Installer/dolphin-emu.png b/Data/dolphin-emu.png similarity index 100% rename from Installer/dolphin-emu.png rename to Data/dolphin-emu.png diff --git a/Installer/dolphin-emu.svg b/Data/dolphin-emu.svg similarity index 100% rename from Installer/dolphin-emu.svg rename to Data/dolphin-emu.svg