From 11bace8804e5a0541ba4575bebf29fc2a8b68d8e Mon Sep 17 00:00:00 2001 From: polar Date: Sat, 15 May 2021 19:20:12 +0100 Subject: [PATCH] BUILD: Move buildfiles & improved prop includes (#10251) * moved buildfiles to subdirectory * fix msvc build * fix cmake build --- 3rdparty/7z/7zlib.vcxproj | 4 ++-- 3rdparty/asmjit/asmjit.vcxproj | 10 +++++----- 3rdparty/curl/libcurl.vcxproj | 4 ++-- 3rdparty/hidapi.vcxproj | 4 ++-- 3rdparty/libpng/libpng.vcxproj | 4 ++-- 3rdparty/libpng/pnglibconf.vcxproj | 4 ++-- 3rdparty/libusb/libusb_static.vcxproj | 4 ++-- 3rdparty/wolfssl.vcxproj | 4 ++-- 3rdparty/xxhash.vcxproj | 10 +++++----- 3rdparty/yaml-cpp.vcxproj | 10 +++++----- 3rdparty/zlib.vcxproj | 4 ++-- CMakeLists.txt | 2 +- Vulkan/glslang-build/glslang-build.vcxproj | 4 ++-- .../spirv-tools-build.vcxproj | 4 ++-- .../cmake}/ConfigureCompiler.cmake | 0 .../cmake}/FindFFMPEG.cmake | 0 .../cmake}/FindWayland.cmake | 0 .../cmake}/cotire.cmake | 0 .../msvc/common_default.props | 0 .../msvc/common_default_clang_cl.props | 0 .../msvc/common_default_macros.props | 0 .../msvc/rpcs3_debug.props | 0 .../msvc/rpcs3_default.props | 0 .../msvc/rpcs3_release.props | 0 llvm_build/llvm_build.vcxproj | 4 ++-- llvm_build/llvm_build_clang_cl.vcxproj | 4 ++-- rpcs3/GLGSRender.vcxproj | 10 +++++----- rpcs3/OpenAL.vcxproj | 18 +++++++++--------- rpcs3/VKGSRender.vcxproj | 10 +++++----- rpcs3/XAudio.vcxproj | 10 +++++----- rpcs3/emucore.vcxproj | 10 +++++----- rpcs3/rpcs3.vcxproj | 12 ++++++------ rpcs3_glslang.props | 16 ---------------- 33 files changed, 75 insertions(+), 91 deletions(-) rename {cmake_modules => buildfiles/cmake}/ConfigureCompiler.cmake (100%) rename {cmake_modules => buildfiles/cmake}/FindFFMPEG.cmake (100%) rename {cmake_modules => buildfiles/cmake}/FindWayland.cmake (100%) rename {cmake_modules => buildfiles/cmake}/cotire.cmake (100%) rename common_default.props => buildfiles/msvc/common_default.props (100%) rename common_default_clang_cl.props => buildfiles/msvc/common_default_clang_cl.props (100%) rename common_default_macros.props => buildfiles/msvc/common_default_macros.props (100%) rename rpcs3_debug.props => buildfiles/msvc/rpcs3_debug.props (100%) rename rpcs3_default.props => buildfiles/msvc/rpcs3_default.props (100%) rename rpcs3_release.props => buildfiles/msvc/rpcs3_release.props (100%) delete mode 100644 rpcs3_glslang.props diff --git a/3rdparty/7z/7zlib.vcxproj b/3rdparty/7z/7zlib.vcxproj index b98fc60a4a..db3421ee9c 100644 --- a/3rdparty/7z/7zlib.vcxproj +++ b/3rdparty/7z/7zlib.vcxproj @@ -109,12 +109,12 @@ Win32Proj My7zlib - + x64 - + StaticLibrary true diff --git a/3rdparty/asmjit/asmjit.vcxproj b/3rdparty/asmjit/asmjit.vcxproj index 06f4e8e4e2..a786d83b84 100644 --- a/3rdparty/asmjit/asmjit.vcxproj +++ b/3rdparty/asmjit/asmjit.vcxproj @@ -76,9 +76,9 @@ {AC40FF01-426E-4838-A317-66354CEFAE88} asmjit - + - + StaticLibrary Unicode @@ -91,13 +91,13 @@ - + - + - + diff --git a/3rdparty/curl/libcurl.vcxproj b/3rdparty/curl/libcurl.vcxproj index 13feb21fab..760061f29d 100644 --- a/3rdparty/curl/libcurl.vcxproj +++ b/3rdparty/curl/libcurl.vcxproj @@ -14,9 +14,9 @@ {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB} libcurl - + - + StaticLibrary false diff --git a/3rdparty/hidapi.vcxproj b/3rdparty/hidapi.vcxproj index c398e2700a..89dd74c0a8 100644 --- a/3rdparty/hidapi.vcxproj +++ b/3rdparty/hidapi.vcxproj @@ -15,9 +15,9 @@ hidapi Win32Proj - + - + StaticLibrary Unicode diff --git a/3rdparty/libpng/libpng.vcxproj b/3rdparty/libpng/libpng.vcxproj index a7bc0df739..bab0d61dbb 100644 --- a/3rdparty/libpng/libpng.vcxproj +++ b/3rdparty/libpng/libpng.vcxproj @@ -16,9 +16,9 @@ libpng - + - + StaticLibrary MultiByte diff --git a/3rdparty/libpng/pnglibconf.vcxproj b/3rdparty/libpng/pnglibconf.vcxproj index 0ef0988bd8..245efc49fe 100644 --- a/3rdparty/libpng/pnglibconf.vcxproj +++ b/3rdparty/libpng/pnglibconf.vcxproj @@ -10,9 +10,9 @@ {EB33566E-DA7F-4D28-9077-88C0B7C77E35} pnglibconf - + - + Application false diff --git a/3rdparty/libusb/libusb_static.vcxproj b/3rdparty/libusb/libusb_static.vcxproj index 85a8563396..703b5bdb25 100644 --- a/3rdparty/libusb/libusb_static.vcxproj +++ b/3rdparty/libusb/libusb_static.vcxproj @@ -15,9 +15,9 @@ {349EE8F9-7D25-4909-AAF5-FF3FADE72187} libusb - + - + StaticLibrary Unicode diff --git a/3rdparty/wolfssl.vcxproj b/3rdparty/wolfssl.vcxproj index 835387555f..f9cbcdcafa 100644 --- a/3rdparty/wolfssl.vcxproj +++ b/3rdparty/wolfssl.vcxproj @@ -15,9 +15,9 @@ wolfssl Win32Proj - + - + StaticLibrary Unicode diff --git a/3rdparty/xxhash.vcxproj b/3rdparty/xxhash.vcxproj index 3cb4cd8b53..6985e3205a 100644 --- a/3rdparty/xxhash.vcxproj +++ b/3rdparty/xxhash.vcxproj @@ -13,9 +13,9 @@ {939FE206-1182-ABC3-1234-FEAB88E98404} - + - + StaticLibrary Unicode @@ -34,13 +34,13 @@ - + - + - + diff --git a/3rdparty/yaml-cpp.vcxproj b/3rdparty/yaml-cpp.vcxproj index 25dd1d324a..f8207470d8 100644 --- a/3rdparty/yaml-cpp.vcxproj +++ b/3rdparty/yaml-cpp.vcxproj @@ -14,9 +14,9 @@ {FDC361C5-7734-493B-8CFB-037308B35122} yamlcpp - + - + StaticLibrary Unicode @@ -31,13 +31,13 @@ - + - + - + diff --git a/3rdparty/zlib.vcxproj b/3rdparty/zlib.vcxproj index 024041566e..2158f1613d 100644 --- a/3rdparty/zlib.vcxproj +++ b/3rdparty/zlib.vcxproj @@ -29,12 +29,12 @@ zlib - + x64 - + StaticLibrary diff --git a/CMakeLists.txt b/CMakeLists.txt index f3cb7e3ecc..53b6534b9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ endif() # include build options include(options.cmake) -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules") +set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/buildfiles/cmake") set(CMAKE_CXX_STANDARD 20) include(CheckCXXCompilerFlag) diff --git a/Vulkan/glslang-build/glslang-build.vcxproj b/Vulkan/glslang-build/glslang-build.vcxproj index 6e7430a1ee..c37741ada9 100644 --- a/Vulkan/glslang-build/glslang-build.vcxproj +++ b/Vulkan/glslang-build/glslang-build.vcxproj @@ -14,9 +14,9 @@ {8F85B6CC-250F-4ACA-A617-E820A74E3E3C} MakeFileProj - + - + Makefile true diff --git a/Vulkan/spirv-tools-build/spirv-tools-build.vcxproj b/Vulkan/spirv-tools-build/spirv-tools-build.vcxproj index 67a6a5e3f4..0aedcfbc19 100644 --- a/Vulkan/spirv-tools-build/spirv-tools-build.vcxproj +++ b/Vulkan/spirv-tools-build/spirv-tools-build.vcxproj @@ -14,9 +14,9 @@ {4CBD3DDD-5555-49A4-A44D-DD3D8CB516A1} MakeFileProj - + - + Makefile true diff --git a/cmake_modules/ConfigureCompiler.cmake b/buildfiles/cmake/ConfigureCompiler.cmake similarity index 100% rename from cmake_modules/ConfigureCompiler.cmake rename to buildfiles/cmake/ConfigureCompiler.cmake diff --git a/cmake_modules/FindFFMPEG.cmake b/buildfiles/cmake/FindFFMPEG.cmake similarity index 100% rename from cmake_modules/FindFFMPEG.cmake rename to buildfiles/cmake/FindFFMPEG.cmake diff --git a/cmake_modules/FindWayland.cmake b/buildfiles/cmake/FindWayland.cmake similarity index 100% rename from cmake_modules/FindWayland.cmake rename to buildfiles/cmake/FindWayland.cmake diff --git a/cmake_modules/cotire.cmake b/buildfiles/cmake/cotire.cmake similarity index 100% rename from cmake_modules/cotire.cmake rename to buildfiles/cmake/cotire.cmake diff --git a/common_default.props b/buildfiles/msvc/common_default.props similarity index 100% rename from common_default.props rename to buildfiles/msvc/common_default.props diff --git a/common_default_clang_cl.props b/buildfiles/msvc/common_default_clang_cl.props similarity index 100% rename from common_default_clang_cl.props rename to buildfiles/msvc/common_default_clang_cl.props diff --git a/common_default_macros.props b/buildfiles/msvc/common_default_macros.props similarity index 100% rename from common_default_macros.props rename to buildfiles/msvc/common_default_macros.props diff --git a/rpcs3_debug.props b/buildfiles/msvc/rpcs3_debug.props similarity index 100% rename from rpcs3_debug.props rename to buildfiles/msvc/rpcs3_debug.props diff --git a/rpcs3_default.props b/buildfiles/msvc/rpcs3_default.props similarity index 100% rename from rpcs3_default.props rename to buildfiles/msvc/rpcs3_default.props diff --git a/rpcs3_release.props b/buildfiles/msvc/rpcs3_release.props similarity index 100% rename from rpcs3_release.props rename to buildfiles/msvc/rpcs3_release.props diff --git a/llvm_build/llvm_build.vcxproj b/llvm_build/llvm_build.vcxproj index 041225b7ae..5559567fbe 100644 --- a/llvm_build/llvm_build.vcxproj +++ b/llvm_build/llvm_build.vcxproj @@ -14,9 +14,9 @@ {8BC303AB-25BE-4276-8E57-73F171B2D672} MakeFileProj - + - + Makefile true diff --git a/llvm_build/llvm_build_clang_cl.vcxproj b/llvm_build/llvm_build_clang_cl.vcxproj index 711fe2c8db..bd2180df06 100644 --- a/llvm_build/llvm_build_clang_cl.vcxproj +++ b/llvm_build/llvm_build_clang_cl.vcxproj @@ -14,9 +14,9 @@ {A37E4273-85DB-4217-B775-CE971B87D9DF} MakeFileProj - + - + Makefile true diff --git a/rpcs3/GLGSRender.vcxproj b/rpcs3/GLGSRender.vcxproj index 34c4b4acd5..1d604d4642 100644 --- a/rpcs3/GLGSRender.vcxproj +++ b/rpcs3/GLGSRender.vcxproj @@ -14,12 +14,12 @@ GLGSRender {3384223A-6D97-4799-9862-359F85312892} - + x64 - + StaticLibrary Unicode @@ -31,13 +31,13 @@ - + - + - + diff --git a/rpcs3/OpenAL.vcxproj b/rpcs3/OpenAL.vcxproj index 8c161b3a3f..3ba5b315d7 100644 --- a/rpcs3/OpenAL.vcxproj +++ b/rpcs3/OpenAL.vcxproj @@ -15,12 +15,12 @@ Win32Proj OpenAL - + x64 - + StaticLibrary Unicode @@ -32,21 +32,21 @@ - + - + - - + + - + - - + + diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/VKGSRender.vcxproj index a295ffd316..e77733dd39 100644 --- a/rpcs3/VKGSRender.vcxproj +++ b/rpcs3/VKGSRender.vcxproj @@ -107,12 +107,12 @@ Win32Proj VKGSRender - + x64 - + StaticLibrary Unicode @@ -124,13 +124,13 @@ - + - + - + diff --git a/rpcs3/XAudio.vcxproj b/rpcs3/XAudio.vcxproj index 802f09d4f4..654031f66f 100644 --- a/rpcs3/XAudio.vcxproj +++ b/rpcs3/XAudio.vcxproj @@ -14,12 +14,12 @@ {78CB2F39-B809-4A06-8329-8C0A19119D3D} XAudio - + x64 - + StaticLibrary Unicode @@ -31,13 +31,13 @@ - + - + - + diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index e279390151..392d660097 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -14,12 +14,12 @@ {C4A10229-4712-4BD2-B63E-50D93C67A038} emucore - + x64 - + StaticLibrary Unicode @@ -29,13 +29,13 @@ - + - + - + diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index f1ac996ece..ed787388e9 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -15,12 +15,12 @@ rpcs3 Qt4VSv1.0 - + x64 - + release\ false @@ -41,13 +41,13 @@ - - + + - - + + diff --git a/rpcs3_glslang.props b/rpcs3_glslang.props deleted file mode 100644 index 63230563c2..0000000000 --- a/rpcs3_glslang.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - -d2FH4- %(AdditionalOptions) - - - -d2:-FH4- %(AdditionalOptions) - - - -