Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed dolphin binaries to primehack derivatives, for Linux; and renamed dolphin's common path from "dolphin-emu" to "primehack". #118

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)

# Set up paths
set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir")
set(datadir ${CMAKE_INSTALL_PREFIX}/share/primehack CACHE PATH "datadir")
set(mandir ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "mandir")
add_definitions(-DDATA_DIR="${datadir}/")

Expand Down Expand Up @@ -1018,16 +1018,16 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD|Darwin")
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD")
# Install the application icon and menu item
install(FILES Data/dolphin-emu.svg
install(FILES Data/primehack.svg
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
install(FILES Data/dolphin-emu.png
install(FILES Data/primehack.png
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)
install(FILES Data/dolphin-emu.desktop
install(FILES Data/primehack.desktop
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
# Install manpages
install(FILES Data/dolphin-emu.6
install(FILES Data/primehack.6
DESTINATION ${mandir}/man6)
install(FILES Data/dolphin-emu-nogui.6
install(FILES Data/primehack-nogui.6
DESTINATION ${mandir}/man6)
endif()

Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions Data/dolphin-emu.desktop → Data/primehack.desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[Desktop Entry]
Version=1.0
Icon=dolphin-emu
Exec=env QT_QPA_PLATFORM=xcb dolphin-emu
Icon=primehack
Exec=env QT_QPA_PLATFORM=xcb primehack
Terminal=false
Type=Application
Categories=Game;Emulator;
Name=Dolphin Emulator
Name=Primehack

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be "PrimeHack"? (Uppercase H)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can always go back and change this to PrimeHack. Didn't see the typo.

GenericName=Wii/GameCube Emulator
Comment=A Wii/GameCube Emulator
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion Source/Core/Common/CommonPaths.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#define NOMEDIA_FILE ".nomedia"
#else
#define USERDATA_DIR "user"
#define DOLPHIN_DATA_DIR "dolphin-emu"
#define DOLPHIN_DATA_DIR "primehack"
#endif

// Dirs in both User and Sys
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinNoGUI/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
target_sources(dolphin-nogui PRIVATE PlatformFBDev.cpp)
endif()

set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME dolphin-emu-nogui)
set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME primehack-nogui)

target_link_libraries(dolphin-nogui
PRIVATE
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/DolphinQt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ if(GETTEXT_MSGFMT_EXECUTABLE)
set(mo ${mo_dir}/${lang}.mo)
else()
set(mo_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang})
set(mo ${mo_dir}/dolphin-emu.mo)
set(mo ${mo_dir}/primehack.mo)
endif()

target_sources(dolphin-emu PRIVATE ${mo})
Expand Down Expand Up @@ -678,6 +678,7 @@ if(APPLE)
/usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu.entitlements" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Dolphin.app" || true)
endif()
else()
set_target_properties(dolphin-emu PROPERTIES OUTPUT_NAME primehack)
install(TARGETS dolphin-emu RUNTIME DESTINATION ${bindir})
endif()

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/DolphinQt/Translation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,9 @@ static bool TryInstallTranslator(const QString& exact_language_code)
StringFromFormat("/Contents/Resources/%s.lproj/dolphin-emu.mo", lang.c_str())
#elif defined LINUX_LOCAL_DEV
File::GetExeDirectory() +
StringFromFormat("/../Source/Core/DolphinQt/%s/dolphin-emu.mo", lang.c_str())
StringFromFormat("/../Source/Core/DolphinQt/%s/primehack.mo", lang.c_str())
#else
StringFromFormat(DATA_DIR "/../locale/%s/LC_MESSAGES/dolphin-emu.mo", lang.c_str())
StringFromFormat(DATA_DIR "/../locale/%s/LC_MESSAGES/primehack.mo", lang.c_str())
#endif
;

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinTool/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ add_executable(dolphin-tool
ToolMain.cpp
)

set_target_properties(dolphin-tool PROPERTIES OUTPUT_NAME dolphin-tool)
set_target_properties(dolphin-tool PROPERTIES OUTPUT_NAME primehack-tool)

target_link_libraries(dolphin-tool
PRIVATE
Expand Down