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.

Sign up for GitHub

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

Rebrand to PrimeHack (Linux) #166

Closed
wants to merge 1 commit into from
Closed

Rebrand to PrimeHack (Linux) #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nitpik but, I realise our github still advertises us similarly (I had not realised this hasn't been changed in like 5 years lol) but it would be more apt to describe primehack more like A GameCube and Wii emulator fork bringing modern FPS features to the Metroid Prime series. The former description is really outdated compared to how much PrimeHack does now.

Copy link
Author

@xiota xiota May 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I'd prefer to avoid naming specific games, even though it's partly already in the project name.

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)
Expand Down
0 Data/Sys/Resources/dolphin_logo.png → Data/Sys/Resources/primehack_logo.png
View file
Open in desktop
File renamed without changes
0 Data/Sys/Resources/[email protected] → Data/Sys/Resources/[email protected]
View file
Open in desktop
File renamed without changes
0 Data/dolphin-emu-nogui.6 → Data/primehack-nogui.6
View file
Open in desktop
File renamed without changes.
0 Data/dolphin-emu.6 → Data/primehack.6
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions Data/dolphin-emu.desktop → Data/primehack.desktop
View file
Open in 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 Emulator
GenericName=Wii/GameCube Emulator
Comment=A Wii/GameCube Emulator
0 Data/dolphin-emu.png → Data/primehack.png
View file
Open in desktop
File renamed without changes
0 Data/dolphin-emu.svg → Data/primehack.svg
View file
Open in desktop
File renamed without changes
6 changes: 3 additions & 3 deletions Source/Core/Common/CommonPaths.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
#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
#define NORMAL_USER_DIR "Dolphin Emulator (Steam)"
#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

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinNoGUI/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/DolphinQt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down Expand Up @@ -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$<$<CONFIG:Debug>:Debug>.entitlements" "$<TARGET_BUNDLE_DIR:dolphin-emu>")
endif()
else()
set_target_properties(dolphin-emu PROPERTIES OUTPUT_NAME primehack)
install(TARGETS dolphin-emu RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinQt/Resources.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/DolphinQt/Translation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
;

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/DolphinTool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down