diff --git a/.gitignore b/.gitignore index a69afd7cc5..9b0108b604 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,5 @@ CMakeLists.txt.user /.vscode/ # Ignore flatpak-builder's cache dir .flatpak-builder +# Ignore CMake user presets +CMakeUserPresets.json diff --git a/.gitmodules b/.gitmodules index d2b6a39f18..6714b5fb6d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "Externals/Qt"] - path = Externals/Qt - url = https://github.com/dolphin-emu/ext-win-qt.git - shallow = true [submodule "Externals/mGBA/mgba"] path = Externals/mGBA/mgba url = https://github.com/mgba-emu/mgba.git @@ -134,3 +130,7 @@ path = Externals/wil url = https://github.com/microsoft/wil.git shallow = true +[submodule "Externals/Qt"] + path = Externals/Qt + url = https://github.com/JoshuaVandaele/ext-win-qt.git + shallow = true diff --git a/CMake/DolphinToolchain.cmake b/CMake/DolphinToolchain.cmake new file mode 100644 index 0000000000..f1d3450cf7 --- /dev/null +++ b/CMake/DolphinToolchain.cmake @@ -0,0 +1,50 @@ +set(ARCH "generic" CACHE STRING "Target architecture") + +set(VALID_ARCHS x86_64 arm64 generic) +if(NOT ARCH IN_LIST VALID_ARCHS) + message(FATAL_ERROR "Invalid ARCH='${ARCH}'. Valid: ${VALID_ARCHS}") +endif() + +if(ARCH STREQUAL "generic") + set(ENABLE_GENERIC "ON") +else() + set(CMAKE_SYSTEM_PROCESSOR "${ARCH}") +endif() + +if (NOT DEFINED CMAKE_SYSTEM_NAME) + if(EXISTS "${CMAKE_SYSROOT}/usr/include/linux") + set(CMAKE_SYSTEM_NAME Linux) + elseif(EXISTS "${CMAKE_SYSROOT}/Windows/System32") + set(CMAKE_SYSTEM_NAME Windows) + elseif(EXISTS "${CMAKE_SYSROOT}/System/Library") + set(CMAKE_SYSTEM_NAME Darwin) + elseif(EXISTS "${CMAKE_SYSROOT}/usr/include/osreldate.h") + set(CMAKE_SYSTEM_NAME FreeBSD) + elseif(EXISTS "${CMAKE_SYSROOT}/usr/include/c++/v1/__locale_dir/locale_base_api/openbsd.h") + set(CMAKE_SYSTEM_NAME OpenBSD) + elseif(EXISTS "${CMAKE_SYSROOT}/usr/include/dev/dm/netbsd-dm.h") + set(CMAKE_SYSTEM_NAME NetBSD) + elseif(EXISTS "${CMAKE_SYSROOT}/boot/system/develop") + set(CMAKE_SYSTEM_NAME Haiku) + else() + message(WARNING "Cannot detect OS from sysroot '${CMAKE_SYSROOT}/'. Cross-compilation has been disabled.") + endif() +endif() + +set(CMAKE_FIND_ROOT_PATH "${CMAKE_SYSROOT}") +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + +if(NOT QT_HOST_PATH) + if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "AMD64") + set(QT_HOST_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.5.1/x64") + else() + set(QT_HOST_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.5.1/ARM64") + endif() + else() + set(QT_HOST_PATH "/usr") + endif() +endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 2711a222a6..35021d9ca8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ ######################################## # General setup # -cmake_minimum_required(VERSION 3.20...4.2.1) +cmake_minimum_required(VERSION 3.25...4.2.1) cmake_policy(SET CMP0080 OLD) # allow using BundleUtilities at configure time @@ -23,10 +23,6 @@ set(CMAKE_CXX_SCAN_FOR_MODULES OFF) project(dolphin-emu) -if (CMAKE_VERSION VERSION_LESS "3.25" AND CMAKE_SYSTEM_NAME MATCHES "Linux") - set(LINUX TRUE) -endif() - if (MSVC) set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 23) @@ -146,12 +142,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() endif() -if(UNIX) - # Builds a relocatable binary on Linux. - # The Sys folder will need to be copied to the Binaries folder. - option(LINUX_LOCAL_DEV "Enable relocatable binary" OFF) -endif() - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake ) @@ -179,20 +169,15 @@ if(CMAKE_SYSROOT) set(ENV{PKG_CONFIG_SYSROOT_DIR} "${CMAKE_SYSROOT}") endif() -# Set where the binary files will be built. The program will not execute from -# here. You must run "make install" to install these to the proper location -# as defined above. -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Binaries) +# Output directory for the Dolphin binary +# We need to use a generator expression here to ensure that multi-config generators +# (like Visual Studio) put the binaries in the right place. +# See https://cmake.org/cmake/help/v4.2/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.html +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_BINARY_DIR}/Binaries>) -if (WIN32) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Binary) - - if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64") - string(APPEND CMAKE_RUNTIME_OUTPUT_DIRECTORY /x64) - elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") - string(APPEND CMAKE_RUNTIME_OUTPUT_DIRECTORY /ARM64) - endif() -endif() +# Output directory for PDB files. PDBs are only generated on Windows with MSVC. +# We set a common directory for all PDBs to avoid littering the Binaries/ directory. +set(CMAKE_PDB_OUTPUT_DIRECTORY $<1:${CMAKE_BINARY_DIR}/pdb>) # setup CCache include(CCache) @@ -213,6 +198,9 @@ else() endif() if(ENABLE_GENERIC) + if(WIN32) + message(FATAL_ERROR "Generic builds are not supported on Windows!") + endif() message(STATUS "Warning! Building generic build!") set(_M_GENERIC 1) add_definitions(-D_M_GENERIC=1) @@ -387,12 +375,6 @@ if(ENABLE_LTO) endif() endif() -if(UNIX) - if(LINUX_LOCAL_DEV) - add_definitions(-DLINUX_LOCAL_DEV) - endif() -endif() - # BSDs put packages in /usr/local instead of /usr, so we need to # force CMake to look in those directories by default, too. # All commands and submodule commands also need to see these @@ -840,7 +822,7 @@ add_subdirectory(Source) # Install shared data files # if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows") - install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN) + install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/Sys PATTERN) endif() if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD|Darwin") install(FILES COPYING DESTINATION ${datadir}) diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000000..33129825e4 --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,397 @@ +{ + "version": 6, + "configurePresets": [ + { + "name": "ninja-generator", + "generator": "Ninja", + "hidden": true + }, + { + "name": "visualstudio-generator", + "generator": "Visual Studio 18 2026", + "toolset": { + "value": "v145", + "strategy": "set" + }, + "hidden": true + }, + + { + "name": "release", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_CONFIGURATION_TYPES": "Release" + }, + "hidden": true + }, + { + "name": "debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_CONFIGURATION_TYPES": "Debug" + }, + "hidden": true + }, + + { + "name": "generic", + "binaryDir": "${sourceDir}/build/generic", + "toolchainFile": "CMake/DolphinToolchain.cmake", + "cacheVariables": { + "ARCH": "generic" + }, + "hidden": true + }, + { + "name": "x64", + "binaryDir": "${sourceDir}/build/x64", + "toolchainFile": "CMake/DolphinToolchain.cmake", + "cacheVariables": { + "ARCH": "x86_64" + }, + "hidden": true + }, + { + "name": "arm64", + "binaryDir": "${sourceDir}/build/ARM64", + "toolchainFile": "CMake/DolphinToolchain.cmake", + "cacheVariables": { + "ARCH": "arm64" + }, + "hidden": true + }, + { + "name": "visualstudio-generic", + "inherits": ["generic", "visualstudio-generator"], + "hidden": true + }, + { + "name": "visualstudio-x64", + "inherits": ["x64", "visualstudio-generator"], + "architecture": { + "value": "x64", + "strategy": "set" + }, + "hidden": true + }, + { + "name": "visualstudio-arm64", + "inherits": ["arm64", "visualstudio-generator"], + "architecture": { + "value": "arm64", + "strategy": "set" + }, + "hidden": true + }, + { + "name": "ninja-generic", + "inherits": ["generic", "ninja-generator"], + "hidden": true + }, + { + "name": "ninja-x64", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "inherits": ["x64", "ninja-generator"], + "hidden": true + }, + { + "name": "ninja-arm64", + "architecture": { + "value": "arm64", + "strategy": "external" + }, + "inherits": ["arm64", "ninja-generator"], + "hidden": true + }, + + { + "name": "visualstudio-release-generic", + "displayName": "Configure: Release - Visual Studio - Generic", + "inherits": ["release", "visualstudio-generic"], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "visualstudio-release-x64", + "displayName": "Configure: Release - Visual Studio - x64", + "inherits": ["release", "visualstudio-x64"], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "visualstudio-release-arm64", + "displayName": "Configure: Release - Visual Studio - ARM64", + "inherits": ["release", "visualstudio-arm64"], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "visualstudio-debug-generic", + "displayName": "Configure: Debug - Visual Studio - Generic", + "inherits": ["debug", "visualstudio-generic"], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "visualstudio-debug-x64", + "displayName": "Configure: Debug - Visual Studio - x64", + "inherits": ["debug", "visualstudio-x64"], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "visualstudio-debug-arm64", + "displayName": "Configure: Debug - Visual Studio - ARM64", + "inherits": ["debug", "visualstudio-arm64"], + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "ninja-release-generic", + "displayName": "Configure: Release - Ninja - Generic", + "inherits": ["release", "ninja-generic"] + }, + { + "name": "ninja-release-x64", + "displayName": "Configure: Release - Ninja - x64", + "inherits": ["release", "ninja-x64"] + }, + { + "name": "ninja-release-arm64", + "displayName": "Configure: Release - Ninja - ARM64", + "inherits": ["release", "ninja-arm64"] + }, + { + "name": "ninja-debug-generic", + "displayName": "Configure: Debug - Ninja - Generic", + "inherits": ["debug", "ninja-generic"] + }, + { + "name": "ninja-debug-x64", + "displayName": "Configure: Debug - Ninja - x64", + "inherits": ["debug", "ninja-x64"] + }, + { + "name": "ninja-debug-arm64", + "displayName": "Configure: Debug - Ninja - ARM64", + "inherits": ["debug", "ninja-arm64"] + } + ], + "buildPresets": [ + { + "name": "visualstudio-build-release-generic", + "displayName": "Build: Release - Visual Studio - Generic", + "configurePreset": "visualstudio-release-generic", + "configuration": "Release", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "visualstudio-build-release-x64", + "displayName": "Build: Release - Visual Studio - x64", + "configurePreset": "visualstudio-release-x64", + "configuration": "Release", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "visualstudio-build-release-arm64", + "displayName": "Build: Release - Visual Studio - ARM64", + "configurePreset": "visualstudio-release-arm64", + "configuration": "Release", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "visualstudio-build-debug-generic", + "displayName": "Build: Debug - Visual Studio - Generic", + "configurePreset": "visualstudio-debug-generic", + "configuration": "Debug", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "visualstudio-build-debug-x64", + "displayName": "Build: Debug - Visual Studio - x64", + "configurePreset": "visualstudio-debug-x64", + "configuration": "Debug", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "visualstudio-build-debug-arm64", + "displayName": "Build: Debug - Visual Studio - ARM64", + "configurePreset": "visualstudio-debug-arm64", + "configuration": "Debug", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "ninja-build-release-generic", + "displayName": "Build: Release - Ninja - Generic", + "configurePreset": "ninja-release-generic" + }, + { + "name": "ninja-build-release-x64", + "displayName": "Build: Release - Ninja - x64", + "configurePreset": "ninja-release-x64" + }, + { + "name": "ninja-build-release-arm64", + "displayName": "Build: Release - Ninja - ARM64", + "configurePreset": "ninja-release-arm64" + }, + { + "name": "ninja-build-debug-generic", + "displayName": "Build: Debug - Ninja - Generic", + "configurePreset": "ninja-debug-generic" + }, + { + "name": "ninja-build-debug-x64", + "displayName": "Build: Debug - Ninja - x64", + "configurePreset": "ninja-debug-x64" + }, + { + "name": "ninja-build-debug-arm64", + "displayName": "Build: Debug - Ninja - ARM64", + "configurePreset": "ninja-debug-arm64" + } + ], + "workflowPresets": [ + { + "name": "visualstudio-release-generic", + "displayName": "Release - Visual Studio - Generic", + "steps": [ + { "type": "configure", "name": "visualstudio-release-generic" }, + { "type": "build", "name": "visualstudio-build-release-generic" } + ] + }, + { + "name": "visualstudio-release-x64", + "displayName": "Release - Visual Studio - x64", + "steps": [ + { "type": "configure", "name": "visualstudio-release-x64" }, + { "type": "build", "name": "visualstudio-build-release-x64" } + ] + }, + { + "name": "visualstudio-release-arm64", + "displayName": "Release - Visual Studio - ARM64", + "steps": [ + { "type": "configure", "name": "visualstudio-release-arm64" }, + { "type": "build", "name": "visualstudio-build-release-arm64" } + ] + }, + { + "name": "visualstudio-debug-generic", + "displayName": "Debug - Visual Studio - Generic", + "steps": [ + { "type": "configure", "name": "visualstudio-debug-generic" }, + { "type": "build", "name": "visualstudio-build-debug-generic" } + ] + }, + { + "name": "visualstudio-debug-x64", + "displayName": "Debug - Visual Studio - x64", + "steps": [ + { "type": "configure", "name": "visualstudio-debug-x64" }, + { "type": "build", "name": "visualstudio-build-debug-x64" } + ] + }, + { + "name": "visualstudio-debug-arm64", + "displayName": "Debug - Visual Studio - ARM64", + "steps": [ + { "type": "configure", "name": "visualstudio-debug-arm64" }, + { "type": "build", "name": "visualstudio-build-debug-arm64" } + ] + }, + { + "name": "ninja-release-generic", + "displayName": "Release - Ninja - Generic", + "steps": [ + { "type": "configure", "name": "ninja-release-generic" }, + { "type": "build", "name": "ninja-build-release-generic" } + ] + }, + { + "name": "ninja-release-x64", + "displayName": "Release - Ninja - x64", + "steps": [ + { "type": "configure", "name": "ninja-release-x64" }, + { "type": "build", "name": "ninja-build-release-x64" } + ] + }, + { + "name": "ninja-release-arm64", + "displayName": "Release - Ninja - ARM64", + "steps": [ + { "type": "configure", "name": "ninja-release-arm64" }, + { "type": "build", "name": "ninja-build-release-arm64" } + ] + }, + { + "name": "ninja-debug-generic", + "displayName": "Debug - Ninja - Generic", + "steps": [ + { "type": "configure", "name": "ninja-debug-generic" }, + { "type": "build", "name": "ninja-build-debug-generic" } + ] + }, + { + "name": "ninja-debug-x64", + "displayName": "Debug - Ninja - x64", + "steps": [ + { "type": "configure", "name": "ninja-debug-x64" }, + { "type": "build", "name": "ninja-build-debug-x64" } + ] + }, + { + "name": "ninja-debug-arm64", + "displayName": "Debug - Ninja - ARM64", + "steps": [ + { "type": "configure", "name": "ninja-debug-arm64" }, + { "type": "build", "name": "ninja-build-debug-arm64" } + ] + } + ] +} diff --git a/CMakeSettings.json b/CMakeSettings.json deleted file mode 100644 index 72ac09bacc..0000000000 --- a/CMakeSettings.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "configurations": [ - { - "name": "Release", - "configurationType": "Release", - "generator": "Ninja", - "inheritEnvironments": [ "msvc_x64_x64" ], - "buildCommandArgs": "", - "buildRoot": "${workspaceRoot}\\Build\\${name}", - "cmakeCommandArgs": "", - "variables": [ - ] - }, - { - "name": "Debug", - "configurationType": "Debug", - "generator": "Ninja", - "inheritEnvironments": [ "msvc_x64_x64" ], - "buildCommandArgs": "", - "buildRoot": "${workspaceRoot}\\Build\\${name}", - "cmakeCommandArgs": "", - "variables": [ - ] - }, - { - "name": "Release (arm64)", - "configurationType": "Release", - "generator": "Ninja", - "inheritEnvironments": [ "msvc_arm64_x64" ], - "buildCommandArgs": "", - "buildRoot": "${workspaceRoot}\\Build\\${name}", - "cmakeCommandArgs": "", - "variables": [ - { - "name": "CMAKE_SYSTEM_NAME", - "value": "Windows" - }, - { - "name": "CMAKE_SYSTEM_PROCESSOR", - "value": "aarch64" - } - ] - }, - { - "name": "Debug (arm64)", - "configurationType": "Debug", - "generator": "Ninja", - "inheritEnvironments": [ "msvc_arm64_x64" ], - "buildCommandArgs": "", - "buildRoot": "${workspaceRoot}\\Build\\${name}", - "cmakeCommandArgs": "", - "variables": [ - { - "name": "CMAKE_SYSTEM_NAME", - "value": "Windows" - }, - { - "name": "CMAKE_SYSTEM_PROCESSOR", - "value": "aarch64" - } - ] - } - ] -} \ No newline at end of file diff --git a/Externals/Bochs_disasm/Bochs_disasm.vcxproj b/Externals/Bochs_disasm/Bochs_disasm.vcxproj deleted file mode 100644 index ca6e249b7d..0000000000 --- a/Externals/Bochs_disasm/Bochs_disasm.vcxproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/Bochs_disasm/exports.props b/Externals/Bochs_disasm/exports.props deleted file mode 100644 index 7502e57cca..0000000000 --- a/Externals/Bochs_disasm/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories) - - - - - {8ada04d7-6db1-4da4-ab55-64fb12a0997b} - - - diff --git a/Externals/FatFs/FatFs.vcxproj b/Externals/FatFs/FatFs.vcxproj deleted file mode 100644 index 659f66083b..0000000000 --- a/Externals/FatFs/FatFs.vcxproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - {3F17D282-A77D-4931-B844-903AD0809A5E} - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Externals/FatFs/exports.props b/Externals/FatFs/exports.props deleted file mode 100644 index 3866879c43..0000000000 --- a/Externals/FatFs/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)FatFs;%(AdditionalIncludeDirectories) - - - - - {3F17D282-A77D-4931-B844-903AD0809A5E} - - - diff --git a/Externals/FreeSurround/FreeSurround.vcxproj b/Externals/FreeSurround/FreeSurround.vcxproj deleted file mode 100644 index da3a11776a..0000000000 --- a/Externals/FreeSurround/FreeSurround.vcxproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - {8498F2FA-5CA6-4169-9971-DE5B1FE6132C} - - - - - - - - - - - - - - include;%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/FreeSurround/FreeSurround.vcxproj.filters b/Externals/FreeSurround/FreeSurround.vcxproj.filters deleted file mode 100644 index ade3fb0d19..0000000000 --- a/Externals/FreeSurround/FreeSurround.vcxproj.filters +++ /dev/null @@ -1,42 +0,0 @@ - - - - - source - - - source - - - source - - - source - - - - - include - - - include - - - include - - - include - - - include - - - - - {776ecb31-6d5e-489f-bac9-b91a1b202345} - - - {11345325-d67c-4a21-b2e9-c7c6c8cfc8b4} - - - \ No newline at end of file diff --git a/Externals/FreeSurround/exports.props b/Externals/FreeSurround/exports.props deleted file mode 100644 index af25a548b7..0000000000 --- a/Externals/FreeSurround/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)FreeSurround\include;%(AdditionalIncludeDirectories) - - - - - {8498f2fa-5ca6-4169-9971-de5b1fe6132c} - - - diff --git a/Externals/LZO/LZO.vcxproj b/Externals/LZO/LZO.vcxproj deleted file mode 100644 index df9855ccf9..0000000000 --- a/Externals/LZO/LZO.vcxproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - {AB993F38-C31D-4897-B139-A620C42BC565} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/LZO/exports.props b/Externals/LZO/exports.props deleted file mode 100644 index 815027470b..0000000000 --- a/Externals/LZO/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)LZO;%(AdditionalIncludeDirectories) - - - - - {ab993f38-c31d-4897-b139-a620c42bc565} - - - diff --git a/Externals/Qt b/Externals/Qt index 495517af2b..831a3e65ff 160000 --- a/Externals/Qt +++ b/Externals/Qt @@ -1 +1 @@ -Subproject commit 495517af2b922c10c24f543e0fd6ea3ddf774e50 +Subproject commit 831a3e65ffb49f7e1bd623c42193e53ab6ce1f8d diff --git a/Externals/SDL/SDL3.vcxproj b/Externals/SDL/SDL3.vcxproj deleted file mode 100644 index d2515630ec..0000000000 --- a/Externals/SDL/SDL3.vcxproj +++ /dev/null @@ -1,533 +0,0 @@ - - - - - - {8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA} - - - - - - - - - - - - - - SDL\src;SDL\include;SDL\include\build_config;%(AdditionalIncludeDirectories) - SDL_AUDIO_DISABLED;SDL_VIDEO_DISABLED;SDL_GPU_DISABLED;SDL_RENDER_DISABLED;SDL_CAMERA_DISABLED;SDL_DIALOG_DISABLED;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Externals/SDL/exports.props b/Externals/SDL/exports.props deleted file mode 100644 index 3f4da20b8c..0000000000 --- a/Externals/SDL/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)SDL\SDL\include;%(AdditionalIncludeDirectories) - - - - - {8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA} - - - diff --git a/Externals/SFML/SFML.vcxproj b/Externals/SFML/SFML.vcxproj deleted file mode 100644 index 072677f948..0000000000 --- a/Externals/SFML/SFML.vcxproj +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - {93D73454-2512-424E-9CDA-4BB357FE13DD} - - - - - - - - - - - - - - SFML\include;SFML\src;%(AdditionalIncludeDirectories) - SFML_STATIC;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/SFML/exports.props b/Externals/SFML/exports.props deleted file mode 100644 index 2f16288301..0000000000 --- a/Externals/SFML/exports.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - $(ExternalsDir)SFML\SFML\include;%(AdditionalIncludeDirectories) - SFML_STATIC;%(PreprocessorDefinitions) - - - - - {93d73454-2512-424e-9cda-4bb357fe13dd} - - - \ No newline at end of file diff --git a/Externals/bzip2/bzip2.vcxproj b/Externals/bzip2/bzip2.vcxproj deleted file mode 100644 index 28e3b2104c..0000000000 --- a/Externals/bzip2/bzip2.vcxproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - {1D8C51D2-FFA4-418E-B183-9F42B6A6717E} - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/bzip2/bzip2.vcxproj.filters b/Externals/bzip2/bzip2.vcxproj.filters deleted file mode 100644 index 97ad4ebde6..0000000000 --- a/Externals/bzip2/bzip2.vcxproj.filters +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/bzip2/exports.props b/Externals/bzip2/exports.props deleted file mode 100644 index c7bf7802e3..0000000000 --- a/Externals/bzip2/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)bzip2\bzip2;%(AdditionalIncludeDirectories) - - - - - {1d8c51d2-ffa4-418e-b183-9f42b6a6717e} - - - diff --git a/Externals/cpp-ipc/cpp-ipc.vcxproj b/Externals/cpp-ipc/cpp-ipc.vcxproj deleted file mode 100644 index 61dc5eda6e..0000000000 --- a/Externals/cpp-ipc/cpp-ipc.vcxproj +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - {7299DDD3-BBEC-4027-AF30-8DACC5415F96} - - - - - - - - - - - - - - cpp-ipc\include;cpp-ipc\src;%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Externals/cpp-ipc/exports.props b/Externals/cpp-ipc/exports.props deleted file mode 100644 index bbcdc43b66..0000000000 --- a/Externals/cpp-ipc/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)cpp-ipc\cpp-ipc\include;%(AdditionalIncludeDirectories) - - - - - {7299DDD3-BBEC-4027-AF30-8DACC5415F96} - - - diff --git a/Externals/cpp-optparse/cpp-optparse.vcxproj b/Externals/cpp-optparse/cpp-optparse.vcxproj deleted file mode 100644 index ffe0dfd4c9..0000000000 --- a/Externals/cpp-optparse/cpp-optparse.vcxproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - {C636D9D1-82FE-42B5-9987-63B7D4836341} - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/cpp-optparse/exports.props b/Externals/cpp-optparse/exports.props deleted file mode 100644 index efe9c290ed..0000000000 --- a/Externals/cpp-optparse/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)cpp-optparse\cpp-optparse;%(AdditionalIncludeDirectories) - - - - - {c636d9d1-82fe-42b5-9987-63b7d4836341} - - - diff --git a/Externals/cubeb/exports.props b/Externals/cubeb/exports.props deleted file mode 100644 index bfea3d3abe..0000000000 --- a/Externals/cubeb/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)cubeb\cubeb\include;$(ExternalsDir)cubeb\msvc;%(AdditionalIncludeDirectories) - - - - - {8ea11166-6512-44fc-b7a5-a4d1ecc81170} - - - diff --git a/Externals/cubeb/msvc/cubeb.vcxproj b/Externals/cubeb/msvc/cubeb.vcxproj deleted file mode 100644 index 9e054bbc3b..0000000000 --- a/Externals/cubeb/msvc/cubeb.vcxproj +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - {8EA11166-6512-44FC-B7A5-A4D1ECC81170} - - - - - - - - - - - - - - ..\cubeb\include;..\cubeb\src;..\msvc;..\cubeb\subprojects;%(AdditionalIncludeDirectories) - WIN32;USE_WASAPI;USE_WINMM;OUTSIDE_SPEEX;FLOATING_POINT;RANDOM_PREFIX=speex;EXPORT=;%(PreprocessorDefinitions) - - - - - NDEBUG;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/cubeb/msvc/cubeb.vcxproj.filters b/Externals/cubeb/msvc/cubeb.vcxproj.filters deleted file mode 100644 index fd366dbb06..0000000000 --- a/Externals/cubeb/msvc/cubeb.vcxproj.filters +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - speex - - - speex - - - speex - - - speex - - - speex - - - speex - - - speex - - - - - - - - - - - - - - speex - - - - - {caf7c7d0-0918-4299-8423-b287285d6fd0} - - - diff --git a/Externals/curl/curl.vcxproj b/Externals/curl/curl.vcxproj deleted file mode 100644 index 553c446bda..0000000000 --- a/Externals/curl/curl.vcxproj +++ /dev/null @@ -1,390 +0,0 @@ - - - - - - {BB00605C-125F-4A21-B33B-7BF418322DCB} - - - - - - - - - - - - - - curl\include;curl\lib;%(AdditionalIncludeDirectories) - BUILDING_LIBCURL;CURL_STATICLIB;CURL_DISABLE_LDAP;USE_WINDOWS_SSPI;USE_SCHANNEL;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Externals/curl/exports.props b/Externals/curl/exports.props deleted file mode 100644 index 5b923bc635..0000000000 --- a/Externals/curl/exports.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(ExternalsDir)curl\curl\include;%(AdditionalIncludeDirectories) - CURL_STATICLIB;%(PreprocessorDefinitions) - - - secur32.lib;%(AdditionalDependencies) - - - - - {bb00605c-125f-4a21-b33b-7bf418322dcb} - - - diff --git a/Externals/discord-rpc/exports.props b/Externals/discord-rpc/exports.props deleted file mode 100644 index 7a4cfe28d9..0000000000 --- a/Externals/discord-rpc/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)discord-rpc\include;%(AdditionalIncludeDirectories) - - - - - {4482fd2a-ec43-3ffb-ac20-2e5c54b05ead} - - - diff --git a/Externals/discord-rpc/src/discord-rpc.vcxproj b/Externals/discord-rpc/src/discord-rpc.vcxproj deleted file mode 100644 index a3f1b38e7f..0000000000 --- a/Externals/discord-rpc/src/discord-rpc.vcxproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} - - - - - - - - - - - - - - ..\include;..\thirdparty\include;%(AdditionalIncludeDirectories) - - - WIN32;_WINDOWS;DISCORD_WINDOWS;%(PreprocessorDefinitions) - ..\include;..\thirdparty\rapidjson-1.1.0\include;%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - - diff --git a/Externals/ed25519/ed25519.vcxproj b/Externals/ed25519/ed25519.vcxproj deleted file mode 100644 index fa79d4deb9..0000000000 --- a/Externals/ed25519/ed25519.vcxproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - {5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/ed25519/ed25519.vcxproj.filters b/Externals/ed25519/ed25519.vcxproj.filters deleted file mode 100644 index d87c39cc1d..0000000000 --- a/Externals/ed25519/ed25519.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/ed25519/exports.props b/Externals/ed25519/exports.props deleted file mode 100644 index c29d10c180..0000000000 --- a/Externals/ed25519/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)ed25519;%(AdditionalIncludeDirectories) - - - - - {5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3} - - - diff --git a/Externals/enet/enet.vcxproj b/Externals/enet/enet.vcxproj deleted file mode 100644 index dfa606d91a..0000000000 --- a/Externals/enet/enet.vcxproj +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - {CBC76802-C128-4B17-BF6C-23B08C313E5E} - - - - - - - - - - - - - - enet\include;%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/enet/enet.vcxproj.filters b/Externals/enet/enet.vcxproj.filters deleted file mode 100644 index 792fcd6065..0000000000 --- a/Externals/enet/enet.vcxproj.filters +++ /dev/null @@ -1,55 +0,0 @@ - - - - - {a5756b80-36f2-45f6-b1f1-b67082477376} - - - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/enet/exports.props b/Externals/enet/exports.props deleted file mode 100644 index 1b2650e63d..0000000000 --- a/Externals/enet/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)enet\enet\include\;%(AdditionalIncludeDirectories) - - - - - {cbc76802-c128-4b17-bf6c-23b08c313e5e} - - - diff --git a/Externals/fmt/exports.props b/Externals/fmt/exports.props deleted file mode 100644 index 25e07f5e17..0000000000 --- a/Externals/fmt/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)fmt\fmt\include;%(AdditionalIncludeDirectories) - - - - - {4BC5A148-0AB3-440F-A980-A29B4B999190} - - - diff --git a/Externals/fmt/fmt.vcxproj b/Externals/fmt/fmt.vcxproj deleted file mode 100644 index 9a978b5848..0000000000 --- a/Externals/fmt/fmt.vcxproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - {4BC5A148-0AB3-440F-A980-A29B4B999190} - - - - - - - - - - - - - - fmt\include;%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/glslang/exports.props b/Externals/glslang/exports.props deleted file mode 100644 index 1bc420fa29..0000000000 --- a/Externals/glslang/exports.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - - $(ExternalsDir)glslang;%(AdditionalIncludeDirectories) - $(ExternalsDir)glslang\glslang;%(AdditionalIncludeDirectories) - $(ExternalsDir)glslang\glslang\glslang;%(AdditionalIncludeDirectories) - $(ExternalsDir)glslang\glslang\glslang\Public;%(AdditionalIncludeDirectories) - $(ExternalsDir)glslang\glslang\SPIRV;%(AdditionalIncludeDirectories) - - - $(BuildRootDir)$(Platform)\$(Configuration)\glslang\bin\;%(AdditionalLibraryDirectories) - - - SPIRVd.lib;OSDependentd.lib;glslangd.lib;glslang-default-resource-limitsd.lib;GenericCodeGend.lib;MachineIndependentd.lib;%(AdditionalDependencies) - - - SPIRV.lib;OSDependent.lib;glslang.lib;glslang-default-resource-limits.lib;GenericCodeGen.lib;MachineIndependent.lib;%(AdditionalDependencies) - - - - - {d178061b-84d3-44f9-beed-efd18d9033f0} - - - diff --git a/Externals/glslang/glslang.vcxproj b/Externals/glslang/glslang.vcxproj deleted file mode 100644 index 6ead065932..0000000000 --- a/Externals/glslang/glslang.vcxproj +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - {D178061B-84D3-44F9-BEED-EFD18D9033F0} - MakeFileProj - - - - - - Makefile - true - - - Makefile - false - - - - - - - - - - - - - "Visual Studio $(VisualStudioVersion.Substring(0,2))" - amd64 - arm64 - call vsdevcmd.bat -arch=$(DevCmdArch) - cmake -G $(CmakeGenerator) -A $(Platform) -DCMAKE_BUILD_TYPE="Release" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -DENABLE_EXCEPTIONS=OFF -S glslang -B "$(BuildRootDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)" - - call vsdevcmd.bat -arch=$(DevCmdArch) - cmake -G $(CmakeGenerator) -A $(Platform) -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDebug -DGLSLANG_TESTS=OFF -DENABLE_GLSLANG_BINARIES=OFF -DBUILD_EXTERNAL=OFF -DENABLE_SPVREMAPPER=OFF -DENABLE_HLSL=OFF -DENABLE_OPT=OFF -DENABLE_EXCEPTIONS=OFF -S glslang -B "$(BuildRootDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)" - - - echo Copying.. - if not exist "$(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\bin\" mkdir -p "$(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\bin\" - copy "$(BuildRootDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\SPIRV\$(CONFIGURATION)\*.lib" "$(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\bin" - copy "$(BuildRootDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\glslang\OSDependent\Windows\$(CONFIGURATION)\*.lib" "$(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\bin" - copy "$(BuildRootDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\glslang\$(CONFIGURATION)\*.lib" "$(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\bin" - - - echo Cleaning.. - rmdir /s /q "$(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\bin\" - rmdir /s /q "$(BuildRootDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)" - - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\override.props')) - - - $(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(BuildRootDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\ - - $(CmakeReleaseCLI) - msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:build /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m - $(CmakeCopyCLI) - - - $(CmakeReleaseCLI) - msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:rebuild /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m - $(CmakeCopyCLI) - - - $(CmakeReleaseCLI) - msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:clean /p:Configuration=Release /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m - $(CmakeCleanCLI) - - - - $(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(BuildRootDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\ - - $(CmakeDebugCLI) - msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:build /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m - $(CmakeCopyCLI) - - - $(CmakeDebugCLI) - msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:rebuild /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m - $(CmakeCopyCLI) - - - $(CmakeDebugCLI) - msbuild.exe "$(IntDir)\ALL_BUILD.vcxproj" /t:clean /p:Configuration=Debug /p:ForceImportBeforeCppTargets="$(PropsAbsPath)" /m - $(CmakeCleanCLI) - - - - - - - - diff --git a/Externals/glslang/glslang.vcxproj.filters b/Externals/glslang/glslang.vcxproj.filters deleted file mode 100644 index 94c470c093..0000000000 --- a/Externals/glslang/glslang.vcxproj.filters +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/Externals/glslang/override.props b/Externals/glslang/override.props deleted file mode 100644 index 065517b7b4..0000000000 --- a/Externals/glslang/override.props +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - 10.0 - - - - stdcpplatest - _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING=1;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - false - - - - _DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Disabled - - - Default - - - - AnySuitable - Speed - true - true - MultiThreadedDLL - false - /Gw /Zc:checkGwOdr %(AdditionalOptions) - true - - - - diff --git a/Externals/imgui/exports.props b/Externals/imgui/exports.props deleted file mode 100644 index bd4b7e546e..0000000000 --- a/Externals/imgui/exports.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - $(ExternalsDir)imgui;$(ExternalsDir)imgui\imgui;%(AdditionalIncludeDirectories) - IMGUI_USER_CONFIG="imgui_user_config.h";%(PreprocessorDefinitions) - - - - - {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb} - - - diff --git a/Externals/imgui/imgui.vcxproj b/Externals/imgui/imgui.vcxproj deleted file mode 100644 index 72b9f43f54..0000000000 --- a/Externals/imgui/imgui.vcxproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB} - - - - - - - - - - - - - - - .;imgui;$(CoreDir);%(AdditionalIncludeDirectories) - IMGUI_USER_CONFIG="imgui_user_config.h";%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/implot/exports.props b/Externals/implot/exports.props deleted file mode 100644 index 8c39fa095d..0000000000 --- a/Externals/implot/exports.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - $(ExternalsDir)imgui;%(AdditionalIncludeDirectories) - $(ExternalsDir)implot/implot;%(AdditionalIncludeDirectories) - - - - - {A608225E-AE0A-4D1A-9B55-97F57C862391} - - - diff --git a/Externals/implot/implot.vcxproj b/Externals/implot/implot.vcxproj deleted file mode 100644 index 11446581c6..0000000000 --- a/Externals/implot/implot.vcxproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - {A608225E-AE0A-4D1A-9B55-97F57C862391} - - - - - - - - - - - - - - - $(CoreDir);%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - diff --git a/Externals/liblzma/exports.props b/Externals/liblzma/exports.props deleted file mode 100644 index 2ab816c7a1..0000000000 --- a/Externals/liblzma/exports.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - $(ExternalsDir)liblzma\api;%(AdditionalIncludeDirectories) - LZMA_API_STATIC;%(PreprocessorDefinitions) - - - - - {055a775f-b4f5-4970-9240-f6cf7661f37b} - - - diff --git a/Externals/liblzma/liblzma.vcxproj b/Externals/liblzma/liblzma.vcxproj deleted file mode 100644 index a4b7ff4a9d..0000000000 --- a/Externals/liblzma/liblzma.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - {055A775F-B4F5-4970-9240-F6CF7661F37B} - - - - - - - - - - - - - - .;api;check;common;delta;lz;lzma;rangecoder;simple;tuklib;%(AdditionalIncludeDirectories) - LZMA_API_STATIC;HAVE_CONFIG_H;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/liblzma/liblzma.vcxproj.filters b/Externals/liblzma/liblzma.vcxproj.filters deleted file mode 100644 index b463cf7c7e..0000000000 --- a/Externals/liblzma/liblzma.vcxproj.filters +++ /dev/null @@ -1,469 +0,0 @@ - - - - - api - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - api\lzma - - - check - - - check - - - check - - - check - - - check - - - check - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - delta - - - delta - - - delta - - - delta - - - lz - - - lz - - - lz - - - lz - - - lzma - - - lzma - - - lzma - - - lzma - - - lzma - - - lzma - - - lzma - - - rangecoder - - - rangecoder - - - rangecoder - - - rangecoder - - - simple - - - simple - - - simple - - - simple - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - - - - {2aae01e0-4f9a-4abc-b7e8-6622ea252cbe} - - - {32f50db1-5a2e-4f5b-bcf0-ffb43969287f} - - - {1a60cf76-1d90-40c7-b11d-a5c98f32895d} - - - {ce106295-7acd-4259-9254-5c3e801f11a9} - - - {36d95fac-7f84-42d2-a432-346d9f9d50e0} - - - {d4258d74-90ac-4e56-8075-7b2e8f24825f} - - - {b517cc3c-86c7-468f-97dd-86fb6d4a4316} - - - {36b5c9a4-420a-41d6-a0d5-c02255b55696} - - - {4f97f27d-2499-4492-ab35-edf73da89040} - - - {bd28534b-ffc6-4488-90b3-708ac608e76c} - - - - - check - - - check - - - check - - - check - - - check - - - check - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - delta - - - delta - - - delta - - - lz - - - lz - - - lz - - - lzma - - - lzma - - - lzma - - - lzma - - - lzma - - - lzma - - - lzma - - - lzma - - - rangecoder - - - simple - - - simple - - - simple - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - tuklib - - - \ No newline at end of file diff --git a/Externals/libspng/exports.props b/Externals/libspng/exports.props deleted file mode 100644 index ac255a65de..0000000000 --- a/Externals/libspng/exports.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - $(ExternalsDir)libspng\libspng\spng;%(AdditionalIncludeDirectories) - SPNG_STATIC;%(PreprocessorDefinitions) - - - - - {447B7B1E-1D74-4AEF-B2B9-6EB41C5D5313} - - - diff --git a/Externals/libspng/spng.vcxproj b/Externals/libspng/spng.vcxproj deleted file mode 100644 index 3a37bbaf5a..0000000000 --- a/Externals/libspng/spng.vcxproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - {447B7B1E-1D74-4AEF-B2B9-6EB41C5D5313} - - - - - - - - - - - - - - libspng\spng;%(AdditionalIncludeDirectories) - SPNG_STATIC;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/libusb/exports.props b/Externals/libusb/exports.props deleted file mode 100644 index 3cca250f25..0000000000 --- a/Externals/libusb/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)libusb\libusb\libusb;%(AdditionalIncludeDirectories) - - - - - {349ee8f9-7d25-4909-aaf5-ff3fade72187} - - - diff --git a/Externals/libusb/libusb-1.0.vcxproj b/Externals/libusb/libusb-1.0.vcxproj deleted file mode 100644 index 5834338af9..0000000000 --- a/Externals/libusb/libusb-1.0.vcxproj +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - {349EE8F9-7D25-4909-AAF5-FF3FADE72187} - - - - - - - - - - - - - - - libusb\msvc;libusb\libusb;%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/lz4/LZ4.vcxproj b/Externals/lz4/LZ4.vcxproj deleted file mode 100644 index 36167718b1..0000000000 --- a/Externals/lz4/LZ4.vcxproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476} - - - - - - - - - - - - - - XXH_NAMESPACE=LZ4_;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/lz4/exports.props b/Externals/lz4/exports.props deleted file mode 100644 index 58d3c4d3ec..0000000000 --- a/Externals/lz4/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)lz4\lz4\lib;%(AdditionalIncludeDirectories) - - - - - {9092C5CC-3E71-41B3-BF68-4A7BDD8A5476} - - - diff --git a/Externals/mGBA/exports.props b/Externals/mGBA/exports.props deleted file mode 100644 index ddc8446c6d..0000000000 --- a/Externals/mGBA/exports.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - $(ExternalsDir)mGBA\mgba\include;%(AdditionalIncludeDirectories) - ENABLE_VFS;ENABLE_DIRECTORIES;%(PreprocessorDefinitions) - - - - - {864C4C8E-296D-3DBC-AD83-F1D5CB6E8EC6} - - - diff --git a/Externals/mGBA/mgba.vcxproj b/Externals/mGBA/mgba.vcxproj deleted file mode 100644 index 026b9b9267..0000000000 --- a/Externals/mGBA/mgba.vcxproj +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - {864C4C8E-296D-3DBC-AD83-F1D5CB6E8EC6} - - - - - - - - - - - - - - mgba\include;mgba\src;mgba\src\third-party\lzma;%(AdditionalIncludeDirectories) - BUILD_STATIC;M_CORE_GB;M_CORE_GBA;USE_LZMA;_7ZIP_PPMD_SUPPPORT;HAVE_STRDUP;HAVE_SETLOCALE;HAVE_CHMOD;HAVE_UMASK;HAVE_CRC32;ENABLE_VFS;ENABLE_VFS_FD;ENABLE_DIRECTORIES;%(PreprocessorDefinitions) - - - "$(CScript)" /nologo /E:JScript "make_version.c.js" - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)obj2\ - - - $(IntDir)obj2\ - - - - $(IntDir)obj2\ - - - - - - - $(IntDir)obj2\ - - - - - $(IntDir)obj2\ - - - - - $(IntDir)obj2\ - - - $(IntDir)obj2\ - - - - - - - - - $(IntDir)obj2\ - - - - - - $(IntDir)obj2\ - - - - - - - - - $(IntDir)obj3\ - - - - - - $(IntDir)obj3\ - - - - - - $(IntDir)obj3\ - - - $(IntDir)obj2\ - - - $(IntDir)obj2\ - - - $(IntDir)obj2\ - - - $(IntDir)obj3\ - - - - - - - - - - $(IntDir)obj3\ - - - - $(IntDir)obj2\ - - - - $(IntDir)obj2\ - - - $(IntDir)obj2\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)obj3\ - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)obj2\ - - - $(IntDir)obj3\ - - - - - - $(IntDir)obj2\ - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/mGBA/mgba.vcxproj.filters b/Externals/mGBA/mgba.vcxproj.filters deleted file mode 100644 index f3080a18e7..0000000000 --- a/Externals/mGBA/mgba.vcxproj.filters +++ /dev/null @@ -1,451 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Generated sources - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Windows-specific code - - - Third-party code - - - Third-party code - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Virtual files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - {57438DCC-46E8-3FBA-90F2-185F80CEBE2C} - - - {C0CFD641-7357-3B1D-B2A3-B2477AEF3147} - - - {6C07F537-79D5-3651-A634-9E523B9936B2} - - - {AFF59D0C-C624-393F-8703-2FB3784928C8} - - - {37E5D4D5-B263-3B94-8968-21228F26DF67} - - - diff --git a/Externals/mbedtls/exports.props b/Externals/mbedtls/exports.props deleted file mode 100644 index e078d2e386..0000000000 --- a/Externals/mbedtls/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)mbedtls\include;%(AdditionalIncludeDirectories) - - - - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - diff --git a/Externals/mbedtls/mbedTLS.vcxproj b/Externals/mbedtls/mbedTLS.vcxproj deleted file mode 100644 index bb8f86cae9..0000000000 --- a/Externals/mbedtls/mbedTLS.vcxproj +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - {BDB6578B-0691-4E80-A46C-DF21639FD3B8} - - - - - - - - - - - - - - include;library;%(AdditionalIncludeDirectories) - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/miniupnpc/exports.props b/Externals/miniupnpc/exports.props deleted file mode 100644 index 09fd4b456e..0000000000 --- a/Externals/miniupnpc/exports.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - $(ExternalsDir)miniupnpc\miniupnp\miniupnpc\include;%(AdditionalIncludeDirectories) - MINIUPNP_STATICLIB;%(PreprocessorDefinitions) - - - - - {31643fdb-1bb8-4965-9de7-000fc88d35ae} - - - diff --git a/Externals/miniupnpc/miniupnpc.vcxproj b/Externals/miniupnpc/miniupnpc.vcxproj deleted file mode 100644 index 72fa14de10..0000000000 --- a/Externals/miniupnpc/miniupnpc.vcxproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - {31643FDB-1BB8-4965-9DE7-000FC88D35AE} - - - - - - - - - - - - - - miniupnp\miniupnpc;miniupnp\miniupnpc\include;%(AdditionalIncludeDirectories) - MINIUPNP_STATICLIB;%(PreprocessorDefinitions) - - - - CD /d "$(ProjectDir)miniupnp\miniupnpc\msvc" - cscript //nologo genminiupnpcstrings.vbs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/minizip-ng/exports.props b/Externals/minizip-ng/exports.props deleted file mode 100644 index 799426edea..0000000000 --- a/Externals/minizip-ng/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)minizip-ng\minizip-ng;%(AdditionalIncludeDirectories) - - - - - {23114507-079a-4418-9707-cfa81a03ca99} - - - diff --git a/Externals/minizip-ng/minizip-ng.vcxproj b/Externals/minizip-ng/minizip-ng.vcxproj deleted file mode 100644 index 9f142dfb89..0000000000 --- a/Externals/minizip-ng/minizip-ng.vcxproj +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - {23114507-079A-4418-9707-CFA81A03CA99} - - - - - - - - - - - - - - - minizip-ng;minizip-ng\compat;%(AdditionalIncludeDirectories) - HAVE_ZLIB;ZLIB_COMPAT;MZ_ZIP_NO_CRYPTO;MZ_ZIP_NO_ENCRYPTION;HAVE_STDINT_H;HAVE_INTTYPES_H;NO_FSEEKO;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/picojson/exports.props b/Externals/picojson/exports.props deleted file mode 100644 index 5cfcec591f..0000000000 --- a/Externals/picojson/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)picojson;%(AdditionalIncludeDirectories) - - - - - {2c0d058e-de35-4471-ad99-e68a2caf9e18} - - - diff --git a/Externals/picojson/picojson.vcxproj b/Externals/picojson/picojson.vcxproj deleted file mode 100644 index ae446bd54a..0000000000 --- a/Externals/picojson/picojson.vcxproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - {2C0D058E-DE35-4471-AD99-E68A2CAF9E18} - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/picojson/picojson.vcxproj.filters b/Externals/picojson/picojson.vcxproj.filters deleted file mode 100644 index 4abcb2be8f..0000000000 --- a/Externals/picojson/picojson.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Externals/pugixml/exports.props b/Externals/pugixml/exports.props deleted file mode 100644 index bec44f1311..0000000000 --- a/Externals/pugixml/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)pugixml\pugixml\src;%(AdditionalIncludeDirectories) - - - - - {38fee76f-f347-484b-949c-b4649381cffb} - - - diff --git a/Externals/pugixml/pugixml.vcxproj b/Externals/pugixml/pugixml.vcxproj deleted file mode 100644 index b78d925718..0000000000 --- a/Externals/pugixml/pugixml.vcxproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - {38FEE76F-F347-484B-949C-B4649381CFFB} - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/rcheevos/exports.props b/Externals/rcheevos/exports.props deleted file mode 100644 index d5e26ded5e..0000000000 --- a/Externals/rcheevos/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)rcheevos;%(AdditionalIncludeDirectories) - - - - - {CC99A910-3752-4465-95AA-7DC240D92A99} - - - diff --git a/Externals/rcheevos/rcheevos.vcxproj b/Externals/rcheevos/rcheevos.vcxproj deleted file mode 100644 index b331e7e5f5..0000000000 --- a/Externals/rcheevos/rcheevos.vcxproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - {CC99A910-3752-4465-95AA-7DC240D92A99} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RC_DISABLE_LUA;RCHEEVOS_URL_SSL;RC_CLIENT_SUPPORTS_HASH;RC_CLIENT_SUPPORTS_EXTERNAL;RC_CLIENT_SUPPORTS_RAINTEGRATION;RC_HASH_NO_ENCRYPTED;RC_HASH_NO_ROM;RC_HASH_NO_ZIP;%(PreprocessorDefinitions) - $(ProjectDir)rcheevos\include;%(AdditionalIncludeDirectories) - - - - - - \ No newline at end of file diff --git a/Externals/spirv_cross/exports.props b/Externals/spirv_cross/exports.props deleted file mode 100644 index 8b5b943690..0000000000 --- a/Externals/spirv_cross/exports.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - $(ExternalsDir)spirv_cross\SPIRV-Cross;%(AdditionalIncludeDirectories) - SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS;%(PreprocessorDefinitions) - - - - - {3d780617-ec8c-4721-b9fd-dfc9bb658c7c} - - - diff --git a/Externals/spirv_cross/spirv_cross.vcxproj b/Externals/spirv_cross/spirv_cross.vcxproj deleted file mode 100644 index de93abda1b..0000000000 --- a/Externals/spirv_cross/spirv_cross.vcxproj +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - {3d780617-ec8c-4721-b9fd-dfc9bb658c7c} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/tinygltf/exports.props b/Externals/tinygltf/exports.props deleted file mode 100644 index 7e2fde81cf..0000000000 --- a/Externals/tinygltf/exports.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - $(ExternalsDir)tinygltf;%(AdditionalIncludeDirectories) - TINYGLTF_NOEXCEPTION;TINYGLTF_NO_EXTERNAL_IMAGE;TINYGLTF_USE_CPP14;%(PreprocessorDefinitions) - - - - - {8bda3693-4999-4d11-9e52-8d08c30b643a} - - - diff --git a/Externals/tinygltf/tinygltf.vcxproj b/Externals/tinygltf/tinygltf.vcxproj deleted file mode 100644 index e33d949e56..0000000000 --- a/Externals/tinygltf/tinygltf.vcxproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - {8bda3693-4999-4d11-9e52-8d08c30b643a} - - - - - - - - - - - - - - tinygltf;%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - diff --git a/Externals/xxhash/exports.props b/Externals/xxhash/exports.props deleted file mode 100644 index 6bcd16a46d..0000000000 --- a/Externals/xxhash/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)xxhash\xxHash\;%(AdditionalIncludeDirectories) - - - - - {677ea016-1182-440c-9345-dc88d1e98c0c} - - - diff --git a/Externals/xxhash/xxhash.vcxproj b/Externals/xxhash/xxhash.vcxproj deleted file mode 100644 index 3c51fd3ae6..0000000000 --- a/Externals/xxhash/xxhash.vcxproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - {677EA016-1182-440C-9345-DC88D1E98C0C} - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/zlib-ng/exports.props b/Externals/zlib-ng/exports.props deleted file mode 100644 index 0813bc25ab..0000000000 --- a/Externals/zlib-ng/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)zlib-ng;%(AdditionalIncludeDirectories) - - - - - {F6EA7144-8D64-4EBB-A13E-76DFBD911EAE} - - - diff --git a/Externals/zlib-ng/zlib-ng.vcxproj b/Externals/zlib-ng/zlib-ng.vcxproj deleted file mode 100644 index 1366e1da77..0000000000 --- a/Externals/zlib-ng/zlib-ng.vcxproj +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - {F6EA7144-8D64-4EBB-A13E-76DFBD911EAE} - - - - - - - - - - - - - - - .;zlib-ng;%(AdditionalIncludeDirectories) - ZLIB_COMPAT;WITH_GZFILEOP;NO_FSEEKO;%(PreprocessorDefinitions) - X86_FEATURES;X86_AVX2;X86_AVX2_ADLER32;X86_AVX_CHUNKSET;X86_AVX512;X86_AVX512_ADLER32;X86_MASK_INTRIN;X86_AVX512VNNI;X86_AVX512VNNI_ADLER32;X86_SSE41;X86_SSE42_CRC_HASH;X86_SSE42_ADLER32;X86_SSE42_CRC_INTRIN;X86_SSE2;X86_SSE2_CHUNKSET;X86_SSE2_SLIDEHASH;X86_SSSE3;X86_SSSE3_ADLER32;X86_PCLMULQDQ_CRC;X86_VPCLMULQDQ_CRC;%(PreprocessorDefinitions) - - ARM_FEATURES;ARM_NOCHECK_ACLE;ARM_ACLE_CRC_HASH;ARM_NEON;ARM_NEON_ADLER32;ARM_NEON_CHUNKSET;ARM_NEON_SLIDEHASH;__ARM_NEON__;ARM_NEON_HASLD4;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/zstd/exports.props b/Externals/zstd/exports.props deleted file mode 100644 index 2e193e0f5e..0000000000 --- a/Externals/zstd/exports.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - $(ExternalsDir)zstd\zstd\lib;%(AdditionalIncludeDirectories) - - - - - {1bea10f3-80ce-4bc4-9331-5769372cdf99} - - - diff --git a/Externals/zstd/zstd.vcxproj b/Externals/zstd/zstd.vcxproj deleted file mode 100644 index 16473350e6..0000000000 --- a/Externals/zstd/zstd.vcxproj +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - {1BEA10F3-80CE-4BC4-9331-5769372CDF99} - - - - - - - - - - - - - - zstd\lib;%(AdditionalIncludeDirectories) - XXH_NAMESPACE=ZSTD_;ZSTD_LEGACY_SUPPORT=0;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Externals/zstd/zstd.vcxproj.filters b/Externals/zstd/zstd.vcxproj.filters deleted file mode 100644 index 41a6c2320c..0000000000 --- a/Externals/zstd/zstd.vcxproj.filters +++ /dev/null @@ -1,203 +0,0 @@ - - - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - decompress - - - decompress - - - decompress - - - decompress - - - - - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - compress - - - decompress - - - decompress - - - decompress - - - - - {e5afedd6-70b2-4294-b99d-e46a6ea9524c} - - - {09a75e83-2919-4d9e-9b05-26773de1e6bc} - - - {f84516ac-36c5-446d-a33f-58b78ba358f6} - - - \ No newline at end of file diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj deleted file mode 100644 index 925884ea04..0000000000 --- a/Languages/Languages.vcxproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - {0E033BE3-2E08-428E-9AE9-BC673EFA12B5} - - - - - - - - - - - - - - ..\Externals\gettext\msgfmt - - - - - - - - - - - - - \ No newline at end of file diff --git a/Languages/Languages.vcxproj.user b/Languages/Languages.vcxproj.user deleted file mode 100644 index 0f3d711228..0000000000 --- a/Languages/Languages.vcxproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - true - - \ No newline at end of file diff --git a/Readme.md b/Readme.md index 1dba43a8a6..a5cf890785 100644 --- a/Readme.md +++ b/Readme.md @@ -36,101 +36,27 @@ Please read the [FAQ](https://dolphin-emu.org/docs/faq/) before using Dolphin. Dolphin can only be installed on devices that satisfy the above requirements. Attempting to install on an unsupported device will fail and display an error message. -## Building for Windows +## Building -Use the solution file `Source/dolphin-emu.sln` to build Dolphin on Windows. -Dolphin targets the latest MSVC shipped with Visual Studio or Build Tools. -Other compilers might be able to build Dolphin on Windows but have not been -tested and are not recommended to be used. Git and latest Windows SDK must be -installed when building. +You may find building instructions on the appropriate wiki page for your operating system: + +* [Windows](https://github.com/dolphin-emu/dolphin/wiki/Building-for-Windows) +* [Linux](https://github.com/dolphin-emu/dolphin/wiki/Building-for-Linux) +* [macOS](https://github.com/dolphin-emu/dolphin/wiki/Building-for-macOS) +* [Android](#android-specific-instructions) +* [OpenBSD](https://github.com/dolphin-emu/dolphin/wiki/Building-for-OpenBSD) (unsupported) + +Before building, make sure to pull all submodules: -Make sure to pull submodules before building: ```sh git submodule update --init --recursive ``` -The "Release" solution configuration includes performance optimizations for the best user experience but complicates debugging Dolphin. -The "Debug" solution configuration is significantly slower, more verbose and less permissive but makes debugging Dolphin easier. - -## Building for Linux and macOS - -Dolphin requires [CMake](https://cmake.org/) for systems other than Windows. -You need a recent version of GCC or Clang with decent c++20 support. CMake will -inform you if your compiler is too old. -Many libraries are bundled with Dolphin and used if they're not installed on -your system. CMake will inform you if a bundled library is used or if you need -to install any missing packages yourself. You may refer to the [wiki](https://github.com/dolphin-emu/dolphin/wiki/Building-for-Linux) for more information. - -Make sure to pull submodules before building: -```sh -git submodule update --init --recursive -``` - -### macOS Build Steps: - -A binary supporting a single architecture can be built using the following steps: - -1. `mkdir build` -2. `cd build` -3. `cmake ..` -4. `make -j $(sysctl -n hw.logicalcpu)` - -An application bundle will be created in `./Binaries`. - -A script is also provided to build universal binaries supporting both x64 and ARM in the same -application bundle using the following steps: - -1. `mkdir build` -2. `cd build` -3. `python ../BuildMacOSUniversalBinary.py` -4. Universal binaries will be available in the `universal` folder - -Doing this is more complex as it requires installation of library dependencies for both x64 and ARM (or universal library -equivalents) and may require specifying additional arguments to point to relevant library locations. -Execute BuildMacOSUniversalBinary.py --help for more details. - -### Linux Global Build Steps: - -To install to your system. - -1. `mkdir build` -2. `cd build` -3. `cmake ..` -4. `make -j $(nproc)` -5. `sudo make install` - -### Linux Local Build Steps: - -Useful for development as root access is not required. - -1. `mkdir Build` -2. `cd Build` -3. `cmake .. -DLINUX_LOCAL_DEV=true` -4. `make -j $(nproc)` -5. `ln -s ../../Data/Sys Binaries/` - -### Linux Portable Build Steps: - -Can be stored on external storage and used on different Linux systems. -Or useful for having multiple distinct Dolphin setups for testing/development/TAS. - -1. `mkdir Build` -2. `cd Build` -3. `cmake .. -DLINUX_LOCAL_DEV=true` -4. `make -j $(nproc)` -5. `cp -r ../Data/Sys/ Binaries/` -6. `touch Binaries/portable.txt` - -## Building for Android +### Android-specific instructions These instructions assume familiarity with Android development. If you do not have an Android dev environment set up, see [AndroidSetup.md](AndroidSetup.md). -Make sure to pull submodules before building: -```sh -git submodule update --init --recursive -``` - If using Android Studio, import the Gradle project located in `./Source/Android`. Android apps are compiled using a build system called Gradle. Dolphin's native component, diff --git a/Source/Android/app/build.gradle.kts b/Source/Android/app/build.gradle.kts index 5eda1b1f5d..87c1fab3f1 100644 --- a/Source/Android/app/build.gradle.kts +++ b/Source/Android/app/build.gradle.kts @@ -97,7 +97,7 @@ android { externalNativeBuild { cmake { path = file("../../../CMakeLists.txt") - version = "3.22.1+" + version = "3.25.0+" } } namespace = "org.dolphinemu.dolphinemu" diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index 1dbbb4ac41..5e2e2e72f7 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -759,27 +759,27 @@ std::string GetExeDirectory() static std::string CreateSysDirectoryPath() { -#if defined(_WIN32) || defined(LINUX_LOCAL_DEV) -#define SYSDATA_DIR "Sys" -#elif defined __APPLE__ -#define SYSDATA_DIR "Contents/Resources/Sys" +#define SYS_FOLDER_NAME "Sys" +#if defined __APPLE__ +#define SYSDATA_DIR "Contents/Resources/" SYS_FOLDER_NAME #else -#ifdef DATA_DIR -#define SYSDATA_DIR DATA_DIR "sys" -#else -#define SYSDATA_DIR "sys" -#endif +#define SYSDATA_DIR DATA_DIR SYS_FOLDER_NAME #endif + std::string sys_directory; + #if defined(__APPLE__) - const std::string sys_directory = GetBundleDirectory() + DIR_SEP SYSDATA_DIR DIR_SEP; -#elif defined(_WIN32) || defined(LINUX_LOCAL_DEV) - const std::string sys_directory = GetExeDirectory() + DIR_SEP SYSDATA_DIR DIR_SEP; + sys_directory = GetBundleDirectory() + DIR_SEP SYSDATA_DIR DIR_SEP; #elif defined ANDROID - const std::string sys_directory = s_android_sys_directory + DIR_SEP; + sys_directory = s_android_sys_directory + DIR_SEP; ASSERT_MSG(COMMON, !s_android_sys_directory.empty(), "Sys directory has not been set"); #else - const std::string sys_directory = SYSDATA_DIR DIR_SEP; + const std::string local_sys_directory = GetExeDirectory() + DIR_SEP SYS_FOLDER_NAME DIR_SEP; + if (IsDirectory(local_sys_directory)) + sys_directory = local_sys_directory; + else + sys_directory = SYSDATA_DIR DIR_SEP; + #endif INFO_LOG_FMT(COMMON, "CreateSysDirectoryPath: Setting to {}", sys_directory); diff --git a/Source/Core/Common/SCMRevGen.vcxproj b/Source/Core/Common/SCMRevGen.vcxproj deleted file mode 100644 index eea1446caa..0000000000 --- a/Source/Core/Common/SCMRevGen.vcxproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - {41279555-F94F-4EBC-99DE-AF863C10C5C4} - - - - - - - - - - - - - - - - true - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/Common/make_scmrev.h.js b/Source/Core/Common/make_scmrev.h.js deleted file mode 100644 index b2ff644ecc..0000000000 --- a/Source/Core/Common/make_scmrev.h.js +++ /dev/null @@ -1,135 +0,0 @@ -var wshShell = new ActiveXObject("WScript.Shell") -var oFS = new ActiveXObject("Scripting.FileSystemObject"); - -var outfile = "./scmrev.h"; -var cmd_revision = " rev-parse HEAD"; -var cmd_describe = " describe --always --long --dirty"; -var cmd_branch = " rev-parse --abbrev-ref HEAD"; -var cmd_commits_ahead = " rev-list --count HEAD ^master"; -var cmd_get_tag = " describe --exact-match HEAD"; - -function GetGitExe() -{ - try - { - gitexe = wshShell.RegRead("HKCU\\Software\\GitExtensions\\gitcommand"); - wshShell.Exec(gitexe); - return gitexe; - } - catch (e) - {} - - for (var gitexe in {"git.cmd":1, "git":1, "git.bat":1}) - { - try - { - wshShell.Exec(gitexe); - return gitexe; - } - catch (e) - {} - } - - // last try - msysgit not in path (vs2015 default) - msyspath = "\\Git\\cmd\\git.exe"; - gitexe = wshShell.ExpandEnvironmentStrings("%PROGRAMFILES(x86)%") + msyspath; - if (oFS.FileExists(gitexe)) { - return gitexe; - } - gitexe = wshShell.ExpandEnvironmentStrings("%PROGRAMFILES%") + msyspath; - if (oFS.FileExists(gitexe)) { - return gitexe; - } - - WScript.Echo("Cannot find git or git.cmd, check your PATH:\n" + - wshShell.ExpandEnvironmentStrings("%PATH%")); - WScript.Quit(1); -} - -function GetFirstStdOutLine(cmd) -{ - try - { - return wshShell.Exec(cmd).StdOut.ReadLine(); - } - catch (e) - { - // catch "the system cannot find the file specified" error - WScript.Echo("Failed to exec " + cmd + " this should never happen"); - WScript.Quit(1); - } -} - -function AttemptToExecuteCommand(cmd) -{ - try - { - var exec = wshShell.Exec(cmd) - - // wait until the command has finished - while (exec.Status == 0) {} - - return exec.ExitCode; - } - catch (e) - { - // catch "the system cannot find the file specified" error - WScript.Echo("Failed to exec " + cmd + " this should never happen"); - WScript.Quit(1); - } -} - -function GetFileContents(f) -{ - try - { - return oFS.OpenTextFile(f).ReadAll(); - } - catch (e) - { - // file doesn't exist - return ""; - } -} - -// get info from git -var gitexe = GetGitExe(); -var revision = GetFirstStdOutLine(gitexe + cmd_revision); -var describe = GetFirstStdOutLine(gitexe + cmd_describe); -var branch = GetFirstStdOutLine(gitexe + cmd_branch); -var commits_ahead = GetFirstStdOutLine(gitexe + cmd_commits_ahead); - -// Get environment information. -var distributor = wshShell.ExpandEnvironmentStrings("%DOLPHIN_DISTRIBUTOR%"); -if (distributor == "%DOLPHIN_DISTRIBUTOR%") distributor = "None"; -var default_update_track = wshShell.ExpandEnvironmentStrings("%DOLPHIN_DEFAULT_UPDATE_TRACK%"); -if (default_update_track == "%DOLPHIN_DEFAULT_UPDATE_TRACK%") default_update_track = ""; - -// remove hash (and trailing "-0" if needed) from description -describe = describe.replace(/(-0)?-[^-]+(-dirty)?$/, '$2'); - -// set commits ahead to zero if on a tag -if (AttemptToExecuteCommand(gitexe + cmd_get_tag) == 0) -{ - commits_ahead = "0"; -} - -var out_contents = - "#define SCM_REV_STR \"" + revision + "\"\n" + - "#define SCM_DESC_STR \"" + describe + "\"\n" + - "#define SCM_BRANCH_STR \"" + branch + "\"\n" + - "#define SCM_COMMITS_AHEAD_MASTER " + commits_ahead + "\n" + - "#define SCM_DISTRIBUTOR_STR \"" + distributor + "\"\n" + - "#define SCM_UPDATE_TRACK_STR \"" + default_update_track + "\"\n"; - -// check if file needs updating -if (out_contents == GetFileContents(outfile)) -{ - WScript.Echo(outfile + " current at " + describe); -} -else -{ - // needs updating - writeout current info - oFS.CreateTextFile(outfile, true).Write(out_contents); - WScript.Echo(outfile + " updated to " + describe); -} diff --git a/Source/Core/DolphinLib.ARM64.props b/Source/Core/DolphinLib.ARM64.props deleted file mode 100644 index 4ff1c4d912..0000000000 --- a/Source/Core/DolphinLib.ARM64.props +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props deleted file mode 100644 index 7d63c5a4b9..0000000000 --- a/Source/Core/DolphinLib.props +++ /dev/null @@ -1,1478 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Core/DolphinLib.vcxproj b/Source/Core/DolphinLib.vcxproj deleted file mode 100644 index 104b2d86ed..0000000000 --- a/Source/Core/DolphinLib.vcxproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - {d79392f7-06d6-4b4b-a39f-4d587c215d3a} - - - - - - - - - - - - - - - - - - - - - - {41279555-f94f-4ebc-99de-af863c10c5c4} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Common\build_info.txt.in - $(BinaryOutputDir)build_info.txt - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/DolphinLib.vcxproj.user b/Source/Core/DolphinLib.vcxproj.user deleted file mode 100644 index 0f3d711228..0000000000 --- a/Source/Core/DolphinLib.vcxproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - true - - \ No newline at end of file diff --git a/Source/Core/DolphinLib.x64.props b/Source/Core/DolphinLib.x64.props deleted file mode 100644 index fc9bb3fa65..0000000000 --- a/Source/Core/DolphinLib.x64.props +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj deleted file mode 100644 index 7c11dac0dd..0000000000 --- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - {974E563D-23F8-4E8F-9083-F62876B04E08} - - - - - - - - - - - - - - - Console - - - - - {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - - {41279555-f94f-4ebc-99de-af863c10c5c4} - - - {0e033be3-2e08-428e-9ae9-bc673efa12b5} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj.filters b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj.filters deleted file mode 100644 index 91e0dceb56..0000000000 --- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index e7e70c508b..8fe320cac3 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -491,7 +491,36 @@ if (MSVC) target_compile_options(dolphin-emu PRIVATE "/GR") endif() -if(WIN32) +if (NOT APPLE AND NOT ANDROID) + # Symlink Sys dir + add_custom_command(TARGET dolphin-emu POST_BUILD + COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys" + ) + + # Symlink COPYING + add_custom_command(TARGET dolphin-emu POST_BUILD + COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/COPYING" + ) + + # Symlink Licenses dir + add_custom_command(TARGET dolphin-emu POST_BUILD + COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_SOURCE_DIR}/LICENSES" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Licenses" + ) +endif() +if (WIN32) + # Symlink qt.conf + add_custom_command(TARGET dolphin-emu POST_BUILD + COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf.win" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf" + ) + + if (ENABLE_AUTOUPDATE) + # Symlink build_info.txt + add_custom_command(TARGET dolphin-emu POST_BUILD + COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_BINARY_DIR}/build_info.txt" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/build_info.txt" + ) + endif() + + target_sources(dolphin-emu PRIVATE DolphinQt.manifest DolphinQt.rc) set_target_properties(dolphin-emu PROPERTIES @@ -499,35 +528,6 @@ if(WIN32) OUTPUT_NAME Dolphin WIN32_EXECUTABLE TRUE ) - - # Copy Sys dir - add_custom_command(TARGET dolphin-emu POST_BUILD - COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys" - COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys" - ) - - # Copy COPYING - add_custom_command(TARGET dolphin-emu POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/COPYING" - ) - - # Copy Licenses dir - add_custom_command(TARGET dolphin-emu POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/LICENSES" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Licenses" - ) - - # Copy qt.conf - add_custom_command(TARGET dolphin-emu POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf.win" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf" - ) - - if (ENABLE_AUTOUPDATE) - # Copy build_info.txt - add_custom_command(TARGET dolphin-emu POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/build_info.txt" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/build_info.txt" - ) - endif() - # Delegate to Qt's official deployment binary on Windows to copy over the necessary Qt-specific libraries, etc. get_target_property(MOC_EXECUTABLE_LOCATION Qt6::moc IMPORTED_LOCATION) get_filename_component(QT_BINARY_DIRECTORY "${MOC_EXECUTABLE_LOCATION}" DIRECTORY) @@ -578,13 +578,9 @@ if(GETTEXT_MSGFMT_EXECUTABLE) foreach(po ${LINGUAS}) get_filename_component(lang ${po} NAME_WE) - if(WIN32) - set(mo_dir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Languages) - set(mo ${mo_dir}/${lang}.mo) - else() - set(mo_dir ${CMAKE_CURRENT_BINARY_DIR}/${lang}) - set(mo ${mo_dir}/dolphin-emu.mo) - endif() + + set(mo_dir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Languages/${lang}) + set(mo ${mo_dir}/dolphin-emu.mo) target_sources(dolphin-emu PRIVATE ${mo}) source_group("Localization\\\\Generated" FILES ${mo}) @@ -595,20 +591,11 @@ if(GETTEXT_MSGFMT_EXECUTABLE) install(FILES ${mo} DESTINATION share/locale/${lang}/LC_MESSAGES) endif() - if(WIN32) - add_custom_command(OUTPUT ${mo} - COMMAND ${CMAKE_COMMAND} -E make_directory ${mo_dir} - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo} ${po} - DEPENDS ${po} - ) - else() - add_custom_command(OUTPUT ${mo} - COMMAND ${CMAKE_COMMAND} -E make_directory ${mo_dir} - COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none ${po} ${pot_file} - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo} ${po} - DEPENDS ${po} - ) - endif() + add_custom_command(OUTPUT ${mo} + COMMAND ${CMAKE_COMMAND} -E make_directory ${mo_dir} + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo} ${po} + DEPENDS ${po} + ) endforeach() endif() diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj deleted file mode 100644 index a9459c971a..0000000000 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ /dev/null @@ -1,530 +0,0 @@ - - - - - - {FA3FA62B-6F58-4B86-9453-4D149940A066} - Dolphin - - - - - - - - - - - - - - - $(ProjectDir)Config\Graphics;%(AdditionalIncludeDirectories) - $(ProjectDir)Config;%(AdditionalIncludeDirectories) - $(ProjectDir)Config\ControllerInterface;%(AdditionalIncludeDirectories) - $(ProjectDir)Config\Mapping;%(AdditionalIncludeDirectories) - $(ProjectDir)Debugger;%(AdditionalIncludeDirectories) - $(ProjectDir)FIFO;%(AdditionalIncludeDirectories) - $(ProjectDir)GameList;%(AdditionalIncludeDirectories) - $(ProjectDir)NetPlay;%(AdditionalIncludeDirectories) - $(ProjectDir)QtUtils;%(AdditionalIncludeDirectories) - $(ProjectDir)Settings;%(AdditionalIncludeDirectories) - $(ProjectDir)TAS;%(AdditionalIncludeDirectories) - $(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories) - - _SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;%(PreprocessorDefinitions) - - $(SourceDir)PCH;%(AdditionalIncludeDirectories) - Use - pch_qt.h - pch_qt.h - - - DolphinQt.manifest;%(AdditionalManifestFiles) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - - {41279555-f94f-4ebc-99de-af863c10c5c4} - - - {0e033be3-2e08-428e-9ae9-bc673efa12b5} - - - - {76563A7F-1011-4EAD-B667-7BB18D09568E} - false - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj.user b/Source/Core/DolphinQt/DolphinQt.vcxproj.user deleted file mode 100644 index 22760f9a5b..0000000000 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj.user +++ /dev/null @@ -1,8 +0,0 @@ - - - - $(BinaryOutputDir)$(TargetFileName) - WindowsLocalDebugger - true - - \ No newline at end of file diff --git a/Source/Core/DolphinQt/Translation.cpp b/Source/Core/DolphinQt/Translation.cpp index 1b93536ac9..8e4339cb2b 100644 --- a/Source/Core/DolphinQt/Translation.cpp +++ b/Source/Core/DolphinQt/Translation.cpp @@ -274,18 +274,17 @@ static bool TryInstallTranslator(const QString& exact_language_code) for (const auto& qlang : FindPossibleLanguageCodes(exact_language_code)) { std::string lang = qlang.toStdString(); - auto filename = -#if defined _WIN32 - fmt::format("{}/Languages/{}.mo", File::GetExeDirectory(), lang) -#elif defined __APPLE__ - fmt::format("{}/Contents/Resources/{}.lproj/dolphin-emu.mo", File::GetBundleDirectory(), - lang) -#elif defined LINUX_LOCAL_DEV - fmt::format("{}/../Source/Core/DolphinQt/{}/dolphin-emu.mo", File::GetExeDirectory(), lang) + std::string filename; +#if defined __APPLE__ + filename = fmt::format("{}/Contents/Resources/{}.lproj/dolphin-emu.mo", + File::GetBundleDirectory(), lang); #else - fmt::format("{}/../locale/{}/LC_MESSAGES/dolphin-emu.mo", DATA_DIR, lang) + filename = fmt::format("{}/Languages/{}/dolphin-emu.mo", File::GetExeDirectory(), lang); +#ifndef _WIN32 + if (!File::Exists(filename)) + filename = fmt::format("{}/../locale/{}/LC_MESSAGES/dolphin-emu.mo", DATA_DIR, lang); +#endif #endif - ; auto* translator = new MoTranslator(QApplication::instance()); if (translator->load(filename)) diff --git a/Source/Core/DolphinTool/DolphinTool.vcxproj b/Source/Core/DolphinTool/DolphinTool.vcxproj deleted file mode 100644 index 79e1264b38..0000000000 --- a/Source/Core/DolphinTool/DolphinTool.vcxproj +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - {8F91523C-5C5E-4B22-A1F1-67560B6DC714} - - - - - - - - - - - - - - - {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - - {41279555-f94f-4ebc-99de-af863c10c5c4} - - - {0e033be3-2e08-428e-9ae9-bc673efa12b5} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj b/Source/Core/WinUpdater/WinUpdater.vcxproj deleted file mode 100644 index 28ae61bb34..0000000000 --- a/Source/Core/WinUpdater/WinUpdater.vcxproj +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03} - - - - - - - - - - - - - - Updater - - - - {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj.filters b/Source/Core/WinUpdater/WinUpdater.vcxproj.filters deleted file mode 100644 index d26f8a82cf..0000000000 --- a/Source/Core/WinUpdater/WinUpdater.vcxproj.filters +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Source/DSPSpy/DSPSpy.vcxproj b/Source/DSPSpy/DSPSpy.vcxproj deleted file mode 100644 index f3eb4620b5..0000000000 --- a/Source/DSPSpy/DSPSpy.vcxproj +++ /dev/null @@ -1,180 +0,0 @@ - - - - - GC - Win32 - - - GC - x64 - - - Wii - Win32 - - - Wii - x64 - - - - {3877AA3E-9CC0-4ADF-8E71-272EE4443478} - DSPSpy - - - - Makefile - MultiByte - true - - - Makefile - MultiByte - true - - - Makefile - MultiByte - true - - - Makefile - MultiByte - true - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - build\ - build\ - ..\..\Binary\$(Platform)\DSPTool.exe -h dsp_code tests\dsp_test.ds -make - - make clean -..\..\Binary\$(Platform)\DSPTool.exe -h dsp_code tests\dsp_code.ds -make - make clean - DSPSpy.dol - $(NMakePreprocessorDefinitions) - $(ProjectDir);C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - build\ - build\ - ..\..\Binary\$(Platform)\DSPTool.exe -h dsp_code tests\dsp_test.ds -make - - make clean -..\..\Binary\$(Platform)\DSPTool.exe -h dsp_code tests\dsp_code.ds -make - make clean - DSPSpy.dol - $(NMakePreprocessorDefinitions) - $(ProjectDir);C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - build\ - build\ - ..\..\Binary\$(Platform)\DSPTool.exe -h dsp_code tests\dsp_test.ds -make HW_TYPE=gamecube - make HW_TYPE=gamecube clean -..\..\Binary\$(Platform)\DSPTool.exe -h dsp_code tests\dsp_code.ds -make HW_TYPE=gamecube - make HW_TYPE=gamecube clean - DSPSpyGC.dol - $(NMakePreprocessorDefinitions) - $(ProjectDir);C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - build\ - build\ - ..\..\Binary\$(Platform)\DSPTool.exe -h dsp_code tests\dsp_test.ds -make HW_TYPE=gamecube - make HW_TYPE=gamecube clean -..\..\Binary\$(Platform)\DSPTool.exe -h dsp_code tests\dsp_code.ds -make HW_TYPE=gamecube - make HW_TYPE=gamecube clean - DSPSpyGC.dol - $(NMakePreprocessorDefinitions) - $(ProjectDir);C:\devkitPro\libogc\include;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - - - - build\BuildLog.htm - - - - - build\BuildLog.htm - - - - - build\BuildLogGC.htm - - - - - build\BuildLogGC.htm - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/DSPSpy/DSPSpy.vcxproj.filters b/Source/DSPSpy/DSPSpy.vcxproj.filters deleted file mode 100644 index 5e52860f1d..0000000000 --- a/Source/DSPSpy/DSPSpy.vcxproj.filters +++ /dev/null @@ -1,96 +0,0 @@ - - - - - {14442340-8be2-4dcf-93f5-421cce23dd31} - - - {1a60828b-80d9-4b23-8b84-9116bf6e2630} - - - {ad8f68d7-73a6-4192-b188-125d2bef2a7a} - - - {251f77cb-8874-4bf1-bb2a-f7e6b009a0fb} - - - {80668e83-9986-4389-b587-21e9c6734589} - - - - - tests - - - tests - - - tests - - - tests - - - tests - - - tests - - - tests - - - tests - - - tests - - - tests - - - util - - - util - - - templates - - - templates - - - Misc uCodes - - - Misc uCodes - - - - - - - - DSP Interface - - - DSP Interface - - - - - - DSP Interface - - - DSP Interface - - - DSP Interface - - - - - - diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj deleted file mode 100644 index 3cfb41b5fc..0000000000 --- a/Source/DSPTool/DSPTool.vcxproj +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - {1970D175-3DE8-4738-942A-4D98D1CDBF64} - - - - - - - - - - - - - - - Console - - - - - - - - - - - - {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/DSPTool/DSPTool.vcxproj.filters b/Source/DSPTool/DSPTool.vcxproj.filters deleted file mode 100644 index d5c714c943..0000000000 --- a/Source/DSPTool/DSPTool.vcxproj.filters +++ /dev/null @@ -1,29 +0,0 @@ - - - - - {0b70242b-1d98-432f-a60e-d4ca0674852e} - - - - - TestData - - - TestData - - - TestData - - - TestData - - - - - - - - - - \ No newline at end of file diff --git a/Source/PCH/pch.vcxproj b/Source/PCH/pch.vcxproj deleted file mode 100644 index 1ee60c60c0..0000000000 --- a/Source/PCH/pch.vcxproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - {76563A7F-1011-4EAD-B667-7BB18D09568E} - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj deleted file mode 100644 index 6b476dad94..0000000000 --- a/Source/UnitTests/UnitTests.vcxproj +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - {474661E7-C73A-43A6-AFEE-EE1EC433D49E} - - - - - - - - - - - - - - - - $(ExternalsDir)gtest\googletest\include;$(ExternalsDir)gtest\googletest;%(AdditionalIncludeDirectories) - - - Console - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - - {0e033be3-2e08-428e-9ae9-bc673efa12b5} - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/UnitTests/UnitTests.vcxproj.user b/Source/UnitTests/UnitTests.vcxproj.user deleted file mode 100644 index 7747d6682d..0000000000 --- a/Source/UnitTests/UnitTests.vcxproj.user +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - $(BinaryOutputDir) - WindowsLocalDebugger - - \ No newline at end of file diff --git a/Source/VSProps/Base.Dolphin.props b/Source/VSProps/Base.Dolphin.props deleted file mode 100644 index 93d58df583..0000000000 --- a/Source/VSProps/Base.Dolphin.props +++ /dev/null @@ -1,97 +0,0 @@ - - - - - $(ProjectName)$(TargetSuffix) - true - - - - - $(CoreDir);%(AdditionalIncludeDirectories) - - - $(ExternalsDir)FFmpeg-bin\$(Platform)\include;%(AdditionalIncludeDirectories) - $(ExternalsDir)OpenAL\include;%(AdditionalIncludeDirectories) - $(ExternalsDir)expr\include;%(AdditionalIncludeDirectories) - $(ExternalsDir)Vulkan-Headers\include;%(AdditionalIncludeDirectories) - $(ExternalsDir)VulkanMemoryAllocator\include;%(AdditionalIncludeDirectories) - $(ExternalsDir)watcher\watcher\include;%(AdditionalIncludeDirectories) - $(ExternalsDir)wil\include;%(AdditionalIncludeDirectories) - - WIL_SUPPRESS_EXCEPTIONS;%(PreprocessorDefinitions) - - WIN32_LEAN_AND_MEAN;NOMINMAX;%(PreprocessorDefinitions) - - - _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - - _WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - - _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions) - - - _ARCH_64=1;_M_X86_64=1;%(PreprocessorDefinitions) - _ARCH_64=1;_M_ARM_64=1;%(PreprocessorDefinitions) - USE_UPNP;__LIBUSB__;%(PreprocessorDefinitions) - USE_ANALYTICS=1;%(PreprocessorDefinitions) - USE_DISCORD_PRESENCE;%(PreprocessorDefinitions) - HAVE_FFMPEG;%(PreprocessorDefinitions) - HAS_OPENGL;%(PreprocessorDefinitions) - HAS_VULKAN;%(PreprocessorDefinitions) - HAS_LIBMGBA;%(PreprocessorDefinitions) - AUTOUPDATE;%(PreprocessorDefinitions) - HAVE_SDL3;%(PreprocessorDefinitions) - USE_RETRO_ACHIEVEMENTS;%(PreprocessorDefinitions) - RC_CLIENT_SUPPORTS_HASH;%(PreprocessorDefinitions) - RC_CLIENT_SUPPORTS_RAINTEGRATION;%(PreprocessorDefinitions) - HAVE_CUBEB;%(PreprocessorDefinitions) - HAVE_CPPIPC;%(PreprocessorDefinitions) - - - 4201;4127;4100;4244;4121;4324;4714;%(DisableSpecificWarnings) - - 4245;%(DisableSpecificWarnings) - - /w44263 /w44265 /w44946 %(AdditionalOptions) - - - - avrt.lib;comctl32.lib;iphlpapi.lib;ksuser.lib;setupapi.lib;shlwapi.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) - opengl32.lib;%(AdditionalDependencies) - - $(ExternalsDir)FFmpeg-bin\$(Platform)\lib;%(AdditionalLibraryDirectories) - avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;bcrypt.lib;%(AdditionalDependencies) - - Crypt32.lib;%(AdditionalDependencies) - - dwmapi.lib;%(AdditionalDependencies) - - enableCompatPatches - - - - - /NODEFAULTLIB:msvcrt %(AdditionalOptions) - - - diff --git a/Source/VSProps/Base.Macros.props b/Source/VSProps/Base.Macros.props deleted file mode 100644 index b2d936ed66..0000000000 --- a/Source/VSProps/Base.Macros.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - false - - D - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..'))\ - $(DolphinRootDir)Build\ - $(DolphinRootDir)Binary\ - $(BinaryRootDir)$(Platform)\ - $(DolphinRootDir)Externals\ - $(DolphinRootDir)Source\ - $(SourceDir)Core\ - %windir%\System32\cscript - $(SourceDir)VSProps\ - - - true - - \ No newline at end of file diff --git a/Source/VSProps/Base.Targets.props b/Source/VSProps/Base.Targets.props deleted file mode 100644 index 99c93fa3e0..0000000000 --- a/Source/VSProps/Base.Targets.props +++ /dev/null @@ -1,24 +0,0 @@ - - - - - Debug - ARM64 - - - Debug - x64 - - - Release - ARM64 - - - Release - x64 - - - - 10.0 - - \ No newline at end of file diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props deleted file mode 100644 index 2d22925d7b..0000000000 --- a/Source/VSProps/Base.props +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - $(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\ - $(IntDir)bin\ - - false - - false - - - - - - TurnOffAllWarnings - true - true - true - - Level4 - true - true - false - true - true - - stdc17 - - stdcpplatest - false - - true - - /Zc:__cplusplus,enumTypes,externConstexpr,preprocessor,templateScope,throwingNew /volatile:iso %(AdditionalOptions) - - /Zo %(AdditionalOptions) - - /utf-8 %(AdditionalOptions) - OldStyle - Caret - - /experimental:deterministic %(AdditionalOptions) - - /pathmap:"$(DolphinRootDir)\"=d:\ %(AdditionalOptions) - /pathmap:"$(WindowsSdkDir)\"=w:\ %(AdditionalOptions) - /pathmap:"$(VCToolsetsDir)\"=v:\ %(AdditionalOptions) - - - - _DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - Disabled - - - Default - - - - AnySuitable - Speed - true - true - MultiThreadedDLL - false - /Gw /Zc:checkGwOdr %(AdditionalOptions) - true - - - - true - true - /experimental:deterministic %(AdditionalOptions) - - - - UseLinkTimeCodeGeneration - true - true - - - true - true - /experimental:deterministic %(AdditionalOptions) - - - - diff --git a/Source/VSProps/ClDisableAllWarnings.props b/Source/VSProps/ClDisableAllWarnings.props deleted file mode 100644 index bd683fd3bd..0000000000 --- a/Source/VSProps/ClDisableAllWarnings.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - TurnOffAllWarnings - - - - \ No newline at end of file diff --git a/Source/VSProps/Configuration.Application.props b/Source/VSProps/Configuration.Application.props deleted file mode 100644 index 8af23ba8a2..0000000000 --- a/Source/VSProps/Configuration.Application.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - Application - - \ No newline at end of file diff --git a/Source/VSProps/Configuration.Base.props b/Source/VSProps/Configuration.Base.props deleted file mode 100644 index d36fe43c89..0000000000 --- a/Source/VSProps/Configuration.Base.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - v143 - Unicode - x64 - ARM64 - - - - - true - - - false - - \ No newline at end of file diff --git a/Source/VSProps/Configuration.StaticLibrary.props b/Source/VSProps/Configuration.StaticLibrary.props deleted file mode 100644 index 0da3b50064..0000000000 --- a/Source/VSProps/Configuration.StaticLibrary.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - StaticLibrary - - \ No newline at end of file diff --git a/Source/VSProps/Configuration.Utility.props b/Source/VSProps/Configuration.Utility.props deleted file mode 100644 index d91a9836ba..0000000000 --- a/Source/VSProps/Configuration.Utility.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - Utility - - \ No newline at end of file diff --git a/Source/VSProps/PCHCommon.props b/Source/VSProps/PCHCommon.props deleted file mode 100644 index 6572d42fbd..0000000000 --- a/Source/VSProps/PCHCommon.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - pch.h - - $(BuildRootDir)$(Platform)\$(Configuration)\pch\pch.pch - - - \ No newline at end of file diff --git a/Source/VSProps/PCHCreate.props b/Source/VSProps/PCHCreate.props deleted file mode 100644 index c51d2803a6..0000000000 --- a/Source/VSProps/PCHCreate.props +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - Create - - - - - - - - - - - - $(BuildLibTargets);ClearLibCompiled - - - - false - - - - diff --git a/Source/VSProps/PCHUse.props b/Source/VSProps/PCHUse.props deleted file mode 100644 index 4bfb5fc673..0000000000 --- a/Source/VSProps/PCHUse.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - Use - pch.h - - - - - {76563A7F-1011-4EAD-B667-7BB18D09568E} - false - true - true - - - \ No newline at end of file diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props deleted file mode 100644 index c42c823f88..0000000000 --- a/Source/VSProps/QtCompile.props +++ /dev/null @@ -1,152 +0,0 @@ - - - - $(ExternalsDir)Qt\Qt6.5.1\ - $(ExternalsQtDir)$(Platform)\ - $(QtTargetDirDefault) - $(QTDIR)\ - false - true - $(QTDIR)include\ - $(QTDIR)lib\ - $(QTDIR)bin\ - $(QTDIR)plugins\ - $(IntDir) - d - $(ExternalsQtDir)x64\ - $(QtDebugSuffix) - QtPlugins - - - - QT_NO_DEBUG;%(PreprocessorDefinitions) - QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions) - QT_USE_QSTRINGBUILDER;QT_NO_CAST_FROM_ASCII;QT_NO_CAST_TO_ASCII;%(PreprocessorDefinitions) - $(QtIncludeDir);%(AdditionalIncludeDirectories) - $(QtIncludeDir)QtCore;%(AdditionalIncludeDirectories) - $(QtIncludeDir)QtGui;%(AdditionalIncludeDirectories) - $(QtIncludeDir)QtWidgets;%(AdditionalIncludeDirectories) - - true - - - $(QtLibDir);%(AdditionalLibraryDirectories) - Qt6Core$(QtLibSuffix).lib;Qt6Gui$(QtLibSuffix).lib;Qt6Widgets$(QtLibSuffix).lib;%(AdditionalDependencies) - Windows - - - - - - - - - - - moc %(Identity) - $(QtHostToolsDir) - %(FullPath) - - $(QtToolOutDir)moc_68\moc_%(Filename).cpp - $(QtToolOutDir)moc_68\ - moc_%(Filename).cpp - output - true - [AllOptions] [AdditionalOptions] - %(OutputFile) - false - - - - - - - - - - - - rcc %(Identity) - $(QtHostToolsDir) - %(FullPath) - $(QtToolOutDir)rcc\qrc_%(Filename).cpp - $(QtToolOutDir)rcc\ - qrc_%(Filename).cpp - %(Filename) - default - false - output - true - [AllOptions] [AdditionalOptions] - %(OutputFile) - - - - - - - - - - - - - - - - - - - - - - $(BinaryOutputDir)qt.conf - - - - - - - - - - diff --git a/Source/VSProps/qt_globals.targets b/Source/VSProps/qt_globals.targets deleted file mode 100644 index 60abfacc32..0000000000 --- a/Source/VSProps/qt_globals.targets +++ /dev/null @@ -1,558 +0,0 @@ - - - - - - - - - - QtVersion; - $(BuildDependsOn); - Qt - - - $(CleanDependsOn); - QtClean - - - $(DesignTimeBuildInitTargets); - Qt - - - $(ComputeCompileInputsTargets); - Qt - - - $(BeforeClCompileTargets); - Qt - - - $(ComputeLinkInputsTargets); - Qt - - - - - - - $(QtVSToolsVersion) - false - $([System.IO.Path]::Combine($(ProjectDir),$(IntDir)qt_work.log)) - $([System.Environment]::ProcessorCount) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $([System.String]::Copy('%(QtLogData.Identity)').Split('|')[1]) - - - - - - - - - - - - - - - - - @(QtWork->'%(WorkType)(%(Identity))') - @(QtWork->'%(DependenciesChanged)') - @(QtWork->'%(InputChanged)') - true - - - - - - - - @(log_entry->'%(Hash)') - - - - - true - true - - - - - - 0 - true - - - - - - - - - $(work_hash) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - InputPath - %(QtWork.Identity) - %(QtWork.Identity) - - - InputPath - @(ResourceFiles->'%(Value)') - @(ResourceFiles->'%(Value)') - - - OutputPath - %(QtWork.OutputFile) - %(QtWork.OutputFile) - - - - - - - - - - - - - - - - - - 0 - - - - - - - %(QtWorkResult.WorkType) - - - %(Identity) - $([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','%(Identity)')) - - - - - - - - - %(QtWorkResult.WorkType) - - - %(Identity) - $([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','%(Identity)')) - - - - - - - - - @(QtWorkResult, '|') - - - - - - - - - - - - - - - - - - - $(IntDir)%(Filename).o - - - - - - - - - - - - $(ProjectDir);%(AdditionalIncludeDirectories) - %(PrecompiledHeaderFile) - - - - - - - - - - - - - @(QtWorkResult->'%(ClCompile)') - - - $(SelectedFiles);$(SelectedClCompile) - - - - - - - - @(QtIncludePath->Distinct()) - - - - $(QtIncludePath);%(ClCompile.AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(QtOuterBuildPrepare);QtOuterBuild;$(QtOuterBuildFinalize) - $(MSBuildProjectFullPath) - $([System.IO.Path]::GetRandomFileName()) - - - - - $(QtOuterBuildPrepare);$(QtOuterBuildFinalize) - - - diff --git a/Source/VSProps/qt_tasks.targets b/Source/VSProps/qt_tasks.targets deleted file mode 100644 index b87ccf039b..0000000000 --- a/Source/VSProps/qt_tasks.targets +++ /dev/null @@ -1,1110 +0,0 @@ - - - - - - - - - - - - - - - - - - files = qrc - .Element("RCC") - .Elements("qresource") - .Elements("file"); - Uri QrcPath = new Uri(QrcFilePath); - Result = files - .Select(x => new Uri(QrcPath, x.Value).LocalPath) - .ToArray(); - ]]> - - - - - - - - - - - - - - - - - - x) - .Select(x => string.Format("[{0}={1}]", x, Item.GetMetadata(x)))) - .ToUpper()); - using (var dataZipped = new MemoryStream()) { - using (var zip = new DeflateStream(dataZipped, CompressionLevel.Fastest)) - zip.Write(data, 0, data.Length); - Hash = Convert.ToBase64String(dataZipped.ToArray()); - } - ]]> - - - - - - - - - -