Skip to content

Commit

Permalink
Revert "Trophy pop-up and viewer enhancements (shadps4-emu#2493)"
Browse files Browse the repository at this point in the history
This reverts commit 22ca57b.
  • Loading branch information
diegolix29 committed Feb 24, 2025
1 parent bb438dc commit 9ea5479
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 795 deletions.
19 changes: 0 additions & 19 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ endif()

add_subdirectory(externals)
include_directories(src)
include_directories(Resources)

if(ENABLE_QT_GUI)
find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent LinguistTools Network Multimedia)
Expand Down Expand Up @@ -954,12 +953,6 @@ set(QT_GUI src/qt_gui/about_dialog.cpp
)
endif()

set(RESOURCEFOLDER Resources/bronze.png
Resources/gold.png
Resources/platinum.png
Resources/silver.png
)

if (ENABLE_QT_GUI)
qt_add_executable(shadps4
${AUDIO_CORE}
Expand All @@ -971,7 +964,6 @@ if (ENABLE_QT_GUI)
${SHADER_RECOMPILER}
${VIDEO_CORE}
${EMULATOR}
${RESOURCEFOLDER}
src/images/shadPS4.icns
)
else()
Expand All @@ -984,7 +976,6 @@ else()
${SHADER_RECOMPILER}
${VIDEO_CORE}
${EMULATOR}
${RESOURCEFOLDER}
src/main.cpp
src/emulator.cpp
src/emulator.h
Expand Down Expand Up @@ -1111,16 +1102,6 @@ add_subdirectory(${HOST_SHADERS_INCLUDE})
add_dependencies(shadps4 host_shaders)
target_include_directories(shadps4 PRIVATE ${HOST_SHADERS_INCLUDE})

# embed resources

include(CMakeRC)
cmrc_add_resource_library(embedded-resources
ALIAS res::embedded
NAMESPACE res
${RESOURCEFOLDER})

target_link_libraries(shadps4 PRIVATE res::embedded)

# ImGui resources
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/imgui/renderer)
add_dependencies(shadps4 ImGui_Resources)
Expand Down
8 changes: 0 additions & 8 deletions REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ path = [
"documents/Screenshots/*",
"documents/Screenshots/Linux/*",
"externals/MoltenVK/MoltenVK_icd.json",
"Resources/bronze.png",
"Resources/gold.png",
"Resources/platinum.png",
"Resources/silver.png",
"scripts/ps4_names.txt",
"src/images/about_icon.png",
"src/images/controller_icon.png",
Expand Down Expand Up @@ -107,7 +103,3 @@ path = "externals/gcn/include/**"
SPDX-FileCopyrightText = "NONE"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "cmake/CMakeRC.cmake"
SPDX-FileCopyrightText = "Copyright (c) 2017 vector-of-bool <[email protected]>"
SPDX-License-Identifier = "MIT"
Binary file removed Resources/bronze.png
Binary file not shown.
Binary file removed Resources/gold.png
Binary file not shown.
Binary file removed Resources/platinum.png
Binary file not shown.
Binary file removed Resources/silver.png
Binary file not shown.
Loading

0 comments on commit 9ea5479

Please sign in to comment.