Skip to content

Commit 847e362

Browse files
MotobugMotobug
committed
Replace many instances of "dolphin-emu"
1 parent ef672df commit 847e362

File tree

11 files changed

+57
-74
lines changed

11 files changed

+57
-74
lines changed

‎.tx/config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ host = https://www.transifex.com
33

44
[o:dolphinemu:p:dolphin-emu:r:emulator]
55
file_filter = Languages/po/<lang>.po
6-
source_file = Languages/po/dolphin-emu.pot
6+
source_file = Languages/po/project-plus-dolphin.pot
77
source_lang = en-US
88
type = PO

‎CMakeLists.txt‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -804,21 +804,14 @@ if(APPLE)
804804
endif()
805805
endif()
806806

807-
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
808-
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Flatpak)
809-
if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml)
810-
file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml)
811-
endif()
812-
endif()
813-
814807
find_package(Git)
815808
if(NOT GIT_FOUND)
816809
set(GIT_EXECUTABLE "")
817810
endif()
818811
add_custom_target(
819812
dolphin_scmrev
820813
${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ScmRevGen.cmake
821-
BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml"
814+
BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist"
822815
VERBATIM
823816
)
824817

‎Data/dolphin-emu.desktop‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Data/project-plus-dolphin-nogui.6‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
.Dt DOLPHIN-EMU-NOGUI 6
33
.Os
44
.Sh NAME
5-
.Nm dolphin-emu-nogui
5+
.Nm project-plus-dolphin-nogui
66
.Nd Nintendo GameCube and Wii emulator
77
.Sh SYNOPSIS
8-
.Nm dolphin-emu-nogui
8+
.Nm project-plus-dolphin-nogui
99
.Op Fl hv
1010
.Op Fl e Ar file
1111
.Sh DESCRIPTION

‎Data/project-plus-dolphin.desktop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Desktop Entry]
22
Version=1.0
3-
Icon=dolphin-emu
3+
Icon=project-plus-dolphin
44
Exec=project-plus-dolphin
55
Terminal=false
66
Type=Application

Languages/po/dolphin-emu.pot renamed to Languages/po/project-plus-dolphin.pot

File renamed without changes.

‎Source/Core/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if (APPLE AND ENABLE_QT)
5252
-replace CFBundleExecutable -string Dolphin
5353
${DOLPHIN_MAC_BUNDLE}/Contents/Info.plist
5454

55-
DEPENDS dolphin-emu)
55+
DEPENDS project-plus-dolphin)
5656

5757
if (ENABLE_AUTOUPDATE)
5858
add_dependencies(build_final_bundle MacUpdater)

‎Source/Core/Common/CommonPaths.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#elif defined(__APPLE__)
1717
#define NORMAL_USER_DIR "Library/Application Support/Dolphin"
1818
#elif defined(ANDROID)
19-
#define NORMAL_USER_DIR "/sdcard/dolphin-emu"
19+
#define NORMAL_USER_DIR "/sdcard/project-plus-dolphin"
2020
#else
21-
#define NORMAL_USER_DIR "dolphin-emu"
21+
#define NORMAL_USER_DIR "project-plus-dolphin"
2222
#endif
2323

2424
// The portable user directory

‎Source/Core/DolphinNoGUI/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
2323
target_sources(dolphin-nogui PRIVATE PlatformFBDev.cpp)
2424
endif()
2525

26-
set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME dolphin-emu-nogui)
26+
set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME project-plus-dolphin-nogui)
2727

2828
target_link_libraries(dolphin-nogui
2929
PRIVATE

‎Source/Core/DolphinQt/CMakeLists.txt‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ message(STATUS "Found Qt version ${Qt6_VERSION}")
1919

2020
set_property(TARGET Qt6::Core PROPERTY INTERFACE_COMPILE_FEATURES "")
2121

22-
add_executable(dolphin-emu
22+
add_executable(project-plus-dolphin
2323
AboutDialog.cpp
2424
AboutDialog.h
2525
CheatSearchFactoryWidget.cpp
@@ -405,19 +405,19 @@ add_executable(dolphin-emu
405405
)
406406

407407
if (WIN32)
408-
target_sources(dolphin-emu PRIVATE
408+
target_sources(project-plus-dolphin PRIVATE
409409
Styles/Dark/dark.qrc
410410
)
411411
endif()
412412

413413
if (NOT WIN32)
414-
target_sources(dolphin-emu PRIVATE
414+
target_sources(project-plus-dolphin PRIVATE
415415
QtUtils/SignalDaemon.cpp
416416
QtUtils/SignalDaemon.h
417417
)
418418
endif()
419419

420-
target_compile_definitions(dolphin-emu
420+
target_compile_definitions(project-plus-dolphin
421421
PRIVATE
422422
-DQT_USE_QSTRINGBUILDER
423423
-DQT_NO_CAST_FROM_ASCII
@@ -427,13 +427,13 @@ PRIVATE
427427
-DQT_WARN_DEPRECATED_UP_TO=0x060501
428428
)
429429

430-
target_include_directories(dolphin-emu
430+
target_include_directories(project-plus-dolphin
431431
PRIVATE
432432
${CMAKE_CURRENT_BINARY_DIR}
433433
${Qt6Gui_PRIVATE_INCLUDE_DIRS}
434434
)
435435

436-
target_link_libraries(dolphin-emu
436+
target_link_libraries(project-plus-dolphin
437437
PRIVATE
438438
core
439439
Qt6::Widgets
@@ -443,7 +443,7 @@ PRIVATE
443443
)
444444

445445
if (WIN32)
446-
target_link_libraries(dolphin-emu
446+
target_link_libraries(project-plus-dolphin
447447
PRIVATE
448448
gdi32.lib
449449
shell32.lib
@@ -458,45 +458,45 @@ if (MSVC)
458458
list(TRANSFORM Qt6Gui_INCLUDE_DIRS PREPEND "/external:I" OUTPUT_VARIABLE qtGui)
459459
list(TRANSFORM Qt6Gui_PRIVATE_INCLUDE_DIRS PREPEND "/external:I" OUTPUT_VARIABLE qtGuiPriv)
460460
list(TRANSFORM Qt6Widgets_PRIVATE_INCLUDE_DIRS PREPEND "/external:I" OUTPUT_VARIABLE qtWidgetsPriv)
461-
target_compile_options(dolphin-emu PRIVATE "${qtGui}")
462-
target_compile_options(dolphin-emu PRIVATE "${qtGuiPriv}")
463-
target_compile_options(dolphin-emu PRIVATE "${qtWidgets}")
461+
target_compile_options(project-plus-dolphin PRIVATE "${qtGui}")
462+
target_compile_options(project-plus-dolphin PRIVATE "${qtGuiPriv}")
463+
target_compile_options(project-plus-dolphin PRIVATE "${qtWidgets}")
464464

465465
# Qt 6.3.0 headers use std::aligned_storage instead of alignas
466-
target_compile_definitions(dolphin-emu PRIVATE _SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING)
466+
target_compile_definitions(project-plus-dolphin PRIVATE _SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING)
467467

468468
# Qt6 requires RTTI
469-
remove_cxx_flag_from_target(dolphin-emu "/GR-")
470-
target_compile_options(dolphin-emu PRIVATE "/GR")
469+
remove_cxx_flag_from_target(project-plus-dolphin "/GR-")
470+
target_compile_options(project-plus-dolphin PRIVATE "/GR")
471471
endif()
472472

473473
if(WIN32)
474-
target_sources(dolphin-emu PRIVATE DolphinQt.manifest DolphinQt.rc)
474+
target_sources(project-plus-dolphin PRIVATE DolphinQt.manifest DolphinQt.rc)
475475

476-
set_target_properties(dolphin-emu PROPERTIES
476+
set_target_properties(project-plus-dolphin PROPERTIES
477477
DEBUG_POSTFIX D
478478
OUTPUT_NAME Dolphin
479479
WIN32_EXECUTABLE TRUE
480480
)
481481

482482
# Copy Sys dir
483-
add_custom_command(TARGET dolphin-emu POST_BUILD
483+
add_custom_command(TARGET project-plus-dolphin POST_BUILD
484484
COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys"
485485
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys"
486486
)
487487

488488
# Copy COPYING
489-
add_custom_command(TARGET dolphin-emu POST_BUILD
489+
add_custom_command(TARGET project-plus-dolphin POST_BUILD
490490
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/COPYING"
491491
)
492492

493493
# Copy Licenses dir
494-
add_custom_command(TARGET dolphin-emu POST_BUILD
494+
add_custom_command(TARGET project-plus-dolphin POST_BUILD
495495
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/LICENSES" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Licenses"
496496
)
497497

498498
# Copy qt.conf
499-
add_custom_command(TARGET dolphin-emu POST_BUILD
499+
add_custom_command(TARGET project-plus-dolphin POST_BUILD
500500
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf.win" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf"
501501
)
502502

@@ -519,7 +519,7 @@ if(WIN32)
519519
# means proper path variables will not be set up, thus the need to ensure they're
520520
# always set up.
521521
#
522-
add_custom_command(TARGET dolphin-emu POST_BUILD
522+
add_custom_command(TARGET project-plus-dolphin POST_BUILD
523523
COMMAND "${CMAKE_COMMAND}" -E env PATH="${QT_BINARY_DIRECTORY}"
524524
"${WINDEPLOYQT_EXE}" --libdir="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
525525
--plugindir="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/QtPlugins"
@@ -528,7 +528,7 @@ if(WIN32)
528528
--no-compiler-runtime
529529
--no-system-d3d-compiler
530530
--no-opengl-sw
531-
"$<TARGET_FILE:dolphin-emu>"
531+
"$<TARGET_FILE:project-plus-dolphin>"
532532
)
533533
endif()
534534

@@ -541,10 +541,10 @@ if(WIN32 AND NOT Gettext_FOUND)
541541
endif()
542542

543543
if(GETTEXT_MSGFMT_EXECUTABLE)
544-
set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot")
544+
set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/project-plus-dolphin.pot")
545545
file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
546546

547-
target_sources(dolphin-emu PRIVATE ${pot_file} ${LINGUAS})
547+
target_sources(project-plus-dolphin PRIVATE ${pot_file} ${LINGUAS})
548548
source_group("Localization" FILES ${LINGUAS})
549549
source_group("Localization\\\\Generated" FILES ${pot_file})
550550

@@ -555,10 +555,10 @@ if(GETTEXT_MSGFMT_EXECUTABLE)
555555
set(mo ${mo_dir}/${lang}.mo)
556556
else()
557557
set(mo_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang})
558-
set(mo ${mo_dir}/dolphin-emu.mo)
558+
set(mo ${mo_dir}/project-plus-dolphin.mo)
559559
endif()
560560

561-
target_sources(dolphin-emu PRIVATE ${mo})
561+
target_sources(project-plus-dolphin PRIVATE ${mo})
562562
source_group("Localization\\\\Generated" FILES ${mo})
563563

564564
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
@@ -588,19 +588,19 @@ if(APPLE)
588588
include(BundleUtilities)
589589

590590
# Ask for an application bundle.
591-
set_target_properties(dolphin-emu PROPERTIES
591+
set_target_properties(project-plus-dolphin PROPERTIES
592592
MACOSX_BUNDLE true
593593
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
594594
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ""
595595
OUTPUT_NAME DolphinQt
596596
)
597597

598598
# Copy qt.conf into the bundle
599-
target_sources(dolphin-emu PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf")
599+
target_sources(project-plus-dolphin PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf")
600600
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/qt.conf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
601601

602602
# Copy icon into the bundle
603-
target_sources(dolphin-emu PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
603+
target_sources(project-plus-dolphin PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
604604
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
605605

606606
# Manually include plugins
@@ -609,70 +609,70 @@ if(APPLE)
609609

610610
# Copy Qt plugins into the bundle
611611
get_target_property(qtcocoa_location Qt6::QCocoaIntegrationPlugin LOCATION)
612-
target_sources(dolphin-emu PRIVATE "${qtcocoa_location}")
612+
target_sources(project-plus-dolphin PRIVATE "${qtcocoa_location}")
613613
set_source_files_properties("${qtcocoa_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/platforms)
614614

615615
get_target_property(qtmacstyle_location Qt6::QMacStylePlugin LOCATION)
616-
target_sources(dolphin-emu PRIVATE "${qtmacstyle_location}")
616+
target_sources(project-plus-dolphin PRIVATE "${qtmacstyle_location}")
617617
set_source_files_properties("${qtmacstyle_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/styles)
618618

619619
# Copy resources into the bundle
620620
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/Data/Sys")
621621
file(GLOB_RECURSE resources RELATIVE "${CMAKE_SOURCE_DIR}/Data" "${CMAKE_SOURCE_DIR}/Data/Sys/*")
622622
foreach(res ${resources})
623-
target_sources(dolphin-emu PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}")
623+
target_sources(project-plus-dolphin PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}")
624624
get_filename_component(resdir "${res}" DIRECTORY)
625625
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES
626626
MACOSX_PACKAGE_LOCATION "Resources/${resdir}")
627627
source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}")
628628
endforeach()
629629

630630
include(DolphinInjectVersionInfo)
631-
dolphin_inject_version_info(dolphin-emu)
631+
dolphin_inject_version_info(project-plus-dolphin)
632632

633633
# Copy MoltenVK into the bundle
634634
if(ENABLE_VULKAN)
635635
if(USE_BUNDLED_MOLTENVK)
636-
add_dependencies(dolphin-emu MoltenVK)
636+
add_dependencies(project-plus-dolphin MoltenVK)
637637
ExternalProject_Get_Property(MoltenVK SOURCE_DIR)
638-
target_sources(dolphin-emu PRIVATE "${SOURCE_DIR}/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib")
638+
target_sources(project-plus-dolphin PRIVATE "${SOURCE_DIR}/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib")
639639
set_source_files_properties("${SOURCE_DIR}/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks GENERATED ON)
640640
else()
641641
find_file(MOLTENVK_DYLIB NAMES libMoltenVK.dylib PATH_SUFFIXES lib)
642642
if(NOT MOLTENVK_DYLIB)
643643
message(FATAL_ERROR "Couldn't find libMoltenVK.dylib. Enable USE_BUNDLED_MOLTENVK?")
644644
endif()
645-
target_sources(dolphin-emu PRIVATE ${MOLTENVK_DYLIB})
645+
target_sources(project-plus-dolphin PRIVATE ${MOLTENVK_DYLIB})
646646
set_source_files_properties(${MOLTENVK_DYLIB} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks)
647647
endif()
648648
endif()
649649

650650
if(NOT SKIP_POSTPROCESS_BUNDLE)
651651
# Update library references to make the bundle portable
652652
include(DolphinPostprocessBundle)
653-
dolphin_postprocess_bundle(dolphin-emu)
653+
dolphin_postprocess_bundle(project-plus-dolphin)
654654
# Fix rpath
655-
add_custom_command(TARGET dolphin-emu
655+
add_custom_command(TARGET project-plus-dolphin
656656
POST_BUILD COMMAND
657657
${CMAKE_INSTALL_NAME_TOOL} -add_rpath "@executable_path/../Frameworks/"
658-
$<TARGET_FILE:dolphin-emu>)
658+
$<TARGET_FILE:project-plus-dolphin>)
659659
endif()
660660

661661
if(MACOS_CODE_SIGNING)
662-
add_custom_command(TARGET dolphin-emu
662+
add_custom_command(TARGET project-plus-dolphin
663663
POST_BUILD
664664
COMMAND "${CMAKE_SOURCE_DIR}/Tools/mac-codesign.sh"
665665
"-e" "${CMAKE_CURRENT_SOURCE_DIR}/DolphinEmu$<$<CONFIG:Debug>:Debug>.entitlements"
666666
"${MACOS_CODE_SIGNING_IDENTITY}"
667-
"$<TARGET_BUNDLE_DIR:dolphin-emu>"
667+
"$<TARGET_BUNDLE_DIR:project-plus-dolphin>"
668668
)
669669
endif()
670670
else()
671-
install(TARGETS dolphin-emu RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
671+
install(TARGETS project-plus-dolphin RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
672672
endif()
673673

674674
if(USE_MGBA)
675-
target_sources(dolphin-emu PRIVATE
675+
target_sources(project-plus-dolphin PRIVATE
676676
GBAHost.cpp
677677
GBAHost.h
678678
GBAWidget.cpp
@@ -681,13 +681,13 @@ if(USE_MGBA)
681681
endif()
682682

683683
if(USE_DISCORD_PRESENCE)
684-
target_compile_definitions(dolphin-emu PRIVATE -DUSE_DISCORD_PRESENCE)
684+
target_compile_definitions(project-plus-dolphin PRIVATE -DUSE_DISCORD_PRESENCE)
685685
endif()
686686

687687
if(USE_RETRO_ACHIEVEMENTS)
688-
target_link_libraries(dolphin-emu PRIVATE rcheevos)
689-
target_compile_definitions(dolphin-emu PRIVATE -DUSE_RETRO_ACHIEVEMENTS)
688+
target_link_libraries(project-plus-dolphin PRIVATE rcheevos)
689+
target_compile_definitions(project-plus-dolphin PRIVATE -DUSE_RETRO_ACHIEVEMENTS)
690690
if(RC_CLIENT_SUPPORTS_RAINTEGRATION)
691-
target_compile_definitions(dolphin-emu PRIVATE -DRC_CLIENT_SUPPORTS_RAINTEGRATION)
691+
target_compile_definitions(project-plus-dolphin PRIVATE -DRC_CLIENT_SUPPORTS_RAINTEGRATION)
692692
endif()
693693
endif()

0 commit comments

Comments
 (0)