From 81620169b6e3195e7d3780a8c8aec04e196cb886 Mon Sep 17 00:00:00 2001 From: Xphalnos <164882787+Xphalnos@users.noreply.github.com> Date: Fri, 12 Jul 2024 13:43:40 +0200 Subject: [PATCH] Removing unused .DLL --- .github/workflows/windows-qt.yml | 3 ++- CMakeLists.txt | 31 ++++++++++--------------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/.github/workflows/windows-qt.yml b/.github/workflows/windows-qt.yml index 9610280bc..099ece0bc 100644 --- a/.github/workflows/windows-qt.yml +++ b/.github/workflows/windows-qt.yml @@ -28,8 +28,9 @@ jobs: - name: Setup Qt uses: jurplel/install-qt-action@v4 with: - arch: win64_msvc2019_64 version: 6.7.2 + arch: win64_msvc2019_64 + archives: qtsvg qtbase - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bd38f642..6c83c9ec8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,12 +14,11 @@ project(shadPS4) option(ENABLE_QT_GUI "Enable the Qt GUI. If not selected then the emulator uses a minimal SDL-based UI instead" OFF) -# This function should be passed a list of all files in a target. It will automatically generate -# file groups following the directory hierarchy, so that the layout of the files in IDEs matches the -# one in the filesystem. +# This function should be passed a list of all files in a target. It will automatically generate file groups +# following the directory hierarchy, so that the layout of the files in IDEs matches the one in the filesystem. function(create_target_directory_groups target_name) - # Place any files that aren't in the source list in a separate group so that they don't get in - # the way. + + # Place any files that aren't in the source list in a separate group so that they don't get in the way. source_group("Other Files" REGULAR_EXPRESSION ".") get_target_property(target_sources "${target_name}" SOURCES) @@ -34,14 +33,6 @@ endfunction() # Setup a custom clang-format target (if clang-format can be found) that will run # against all the src files. This should be used before making a pull request. -# ======================================================================= - -set(CLANG_FORMAT_POSTFIX "-17") -find_program(CLANG_FORMAT - NAMES clang-format${CLANG_FORMAT_POSTFIX} - clang-format - PATHS ${PROJECT_BINARY_DIR}/externals) - if (CLANG_FORMAT) set(SRCS ${PROJECT_SOURCE_DIR}/src) set(CCOMMENT "Running clang format against all the .h and .cpp files in src/") @@ -62,8 +53,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") find_package(Boost 1.84.0 CONFIG) find_package(cryptopp 8.9.0 MODULE) -find_package(fmt 10.2.1 CONFIG) -find_package(glslang 14.2.0 CONFIG) +find_package(fmt 11.0.1 CONFIG) +find_package(glslang 14.3.0 CONFIG) find_package(magic_enum 0.9.6 CONFIG) find_package(SDL3 3.1.2 CONFIG) find_package(toml11 3.8.1 CONFIG) @@ -72,7 +63,7 @@ find_package(VulkanHeaders 1.3.289 CONFIG) find_package(VulkanMemoryAllocator 3.1.0 CONFIG) find_package(xbyak 7.07 CONFIG) find_package(xxHash 0.8.2 MODULE) -find_package(zlib-ng 2.2.0 MODULE) +find_package(zlib-ng 2.2.1 MODULE) find_package(Zydis 4.1.0 CONFIG) add_subdirectory(externals) @@ -474,7 +465,7 @@ set(EMULATOR src/emulator.cpp src/sdl_window.cpp ) -# the above is shared in sdl and qt version (TODO share them all) +# The above is shared in SDL and Qt version (TODO share them all) if(ENABLE_QT_GUI) qt_add_resources(RESOURCE_FILES src/shadps4.qrc) @@ -590,7 +581,5 @@ add_dependencies(shadps4 host_shaders) target_include_directories(shadps4 PRIVATE ${HOST_SHADERS_INCLUDE}) if (ENABLE_QT_GUI) - set_target_properties(shadps4 PROPERTIES -# WIN32_EXECUTABLE ON - MACOSX_BUNDLE ON) -endif() + set_target_properties(shadps4 PROPERTIES WIN32_EXECUTABLE ON) +endif() \ No newline at end of file