diff --git a/CMakeLists.txt b/CMakeLists.txt index 781e3d01e1..494e9f2d62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15.0" CACHE STRING "") set(CMAKE_USER_MAKE_RULES_OVERRIDE "CMake/FlagsOverride.cmake") -project(dolphin-emu) +project(primehack) if (MSVC) if (POLICY CMP0117) @@ -172,7 +172,7 @@ include(RemoveCompileFlag) set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Set up paths -set(datadir ${CMAKE_INSTALL_FULL_DATADIR}/dolphin-emu CACHE PATH "datadir") +set(datadir ${CMAKE_INSTALL_FULL_DATADIR}/primehack CACHE PATH "datadir") add_definitions(-DDATA_DIR="${datadir}/") if(CMAKE_SYSROOT) @@ -834,27 +834,27 @@ 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 ${CMAKE_INSTALL_MANDIR}/man6) - install(FILES Data/dolphin-emu-nogui.6 + install(FILES Data/primehack-nogui.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) endif() # packaging information -set(CPACK_PACKAGE_NAME "dolphin-emu") -set(CPACK_PACKAGE_VENDOR "Dolphin Team") +set(CPACK_PACKAGE_NAME "primehack") +set(CPACK_PACKAGE_VENDOR "PrimeHack Team") set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_VERSION_PATCH}) set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/Data/cpack_package_description.txt) -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A GameCube and Wii emulator") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A GameCube and Wii emulator with mouselook controls") set(CPACK_RPM_PACKAGE_GROUP System/Emulators/Other) set(CPACK_RPM_PACKAGE_LICENSE GPL-2.0) diff --git a/Data/dolphin-emu.desktop b/Data/dolphin-emu.desktop index a998ce4370..927c2c63cf 100644 --- a/Data/dolphin-emu.desktop +++ b/Data/dolphin-emu.desktop @@ -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 Emulator GenericName=Wii/GameCube Emulator Comment=A Wii/GameCube Emulator diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 44ada6dd19..0b81d6a33b 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -17,9 +17,9 @@ #elif defined(__APPLE__) #define NORMAL_USER_DIR "Library/Application Support/Dolphin" #elif defined(ANDROID) -#define NORMAL_USER_DIR "/sdcard/dolphin-emu" +#define NORMAL_USER_DIR "/sdcard/primehack" #else -#define NORMAL_USER_DIR "dolphin-emu" +#define NORMAL_USER_DIR "primehack" #endif #else // ifndef STEAM #ifdef _WIN32 @@ -27,7 +27,7 @@ #elif defined(__APPLE__) #define NORMAL_USER_DIR "Library/Application Support/Dolphin (Steam)" #else -#define NORMAL_USER_DIR "dolphin-emu-steam" +#define NORMAL_USER_DIR "primehack-steam" #endif #endif diff --git a/Source/Core/DolphinNoGUI/CMakeLists.txt b/Source/Core/DolphinNoGUI/CMakeLists.txt index 820f01c275..acd419caa4 100644 --- a/Source/Core/DolphinNoGUI/CMakeLists.txt +++ b/Source/Core/DolphinNoGUI/CMakeLists.txt @@ -22,7 +22,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 diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index b585027898..63353bcd16 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -536,7 +536,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}) @@ -644,6 +644,7 @@ if(APPLE) COMMAND /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu$<$:Debug>.entitlements" "$") endif() else() + set_target_properties(dolphin-emu PROPERTIES OUTPUT_NAME primehack) install(TARGETS dolphin-emu RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() diff --git a/Source/Core/DolphinQt/Resources.cpp b/Source/Core/DolphinQt/Resources.cpp index 84fbcc8df8..0e9186d874 100644 --- a/Source/Core/DolphinQt/Resources.cpp +++ b/Source/Core/DolphinQt/Resources.cpp @@ -94,7 +94,7 @@ void Resources::Init() } m_misc.append(GetResourceIcon("nobanner")); - m_misc.append(GetResourceIcon("dolphin_logo")); + m_misc.append(GetResourceIcon("primehack_logo")); } QIcon Resources::GetPlatform(DiscIO::Platform platform) diff --git a/Source/Core/DolphinQt/Translation.cpp b/Source/Core/DolphinQt/Translation.cpp index 83404d6a76..e3eda53770 100644 --- a/Source/Core/DolphinQt/Translation.cpp +++ b/Source/Core/DolphinQt/Translation.cpp @@ -280,12 +280,12 @@ static bool TryInstallTranslator(const QString& exact_language_code) #if defined _WIN32 fmt::format("{}/Languages/{}.mo", File::GetExeDirectory(), lang) #elif defined __APPLE__ - fmt::format("{}/Contents/Resources/{}.lproj/dolphin-emu.mo", File::GetBundleDirectory(), + fmt::format("{}/Contents/Resources/{}.lproj/primehack.mo", File::GetBundleDirectory(), lang) #elif defined LINUX_LOCAL_DEV - fmt::format("{}/../Source/Core/DolphinQt/{}/dolphin-emu.mo", File::GetExeDirectory(), lang) + fmt::format("{}/../Source/Core/DolphinQt/{}/primehack.mo", File::GetExeDirectory(), lang) #else - fmt::format("{}/../locale/{}/LC_MESSAGES/dolphin-emu.mo", DATA_DIR, lang) + fmt::format("{}/../locale/{}/LC_MESSAGES/primehack.mo", DATA_DIR, lang) #endif ; diff --git a/Source/Core/DolphinTool/CMakeLists.txt b/Source/Core/DolphinTool/CMakeLists.txt index e2c8c8cdd1..0d2b594a1f 100644 --- a/Source/Core/DolphinTool/CMakeLists.txt +++ b/Source/Core/DolphinTool/CMakeLists.txt @@ -9,7 +9,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