From 4f62cf9011364b8d208171008d07de873ffa9244 Mon Sep 17 00:00:00 2001 From: Our Favorite Fruit Date: Tue, 5 Mar 2024 05:23:32 +0100 Subject: [PATCH] Updated submodules, support building with compiler with default -D_FORTIFY_SOURCE set --- .gitmodules | 8 ++++---- src/CMakeLists.txt | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 87873ae00..15fb59c30 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "boost"] path = externals/boost - url = https://github.com/citra-emu/ext-boost.git + url = https://github.com/ourfavoritefruits/ext-boost.git [submodule "nihstro"] path = externals/nihstro url = https://github.com/neobrain/nihstro.git @@ -12,7 +12,7 @@ url = https://github.com/catchorg/Catch2 [submodule "dynarmic"] path = externals/dynarmic - url = https://github.com/merryhime/dynarmic.git + url = https://github.com/ourfavoritefruits/dynarmic.git [submodule "xbyak"] path = externals/xbyak url = https://github.com/herumi/xbyak.git @@ -27,7 +27,7 @@ url = https://github.com/benhoyt/inih.git [submodule "libressl"] path = externals/libressl - url = https://github.com/citra-emu/ext-libressl-portable.git + url = https://github.com/ourfavoritefruits/ext-libressl-portable.git [submodule "libusb"] path = externals/libusb/libusb url = https://github.com/libusb/libusb.git @@ -84,7 +84,7 @@ url = https://github.com/knik0/faad2 [submodule "library-headers"] path = externals/library-headers - url = https://github.com/citra-emu/ext-library-headers.git + url = https://github.com/ourfavoritefruits/ext-library-headers.git [submodule "libadrenotools"] path = externals/libadrenotools url = https://github.com/bylaws/libadrenotools diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 461cd57e6..d3c2037a9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -117,6 +117,7 @@ else() if (NOT CMAKE_BUILD_TYPE STREQUAL Debug) # _FORTIFY_SOURCE can't be used without optimizations. + add_compile_options(-Wp,-U_FORTIFY_SOURCE) add_compile_options(-Wp,-D_FORTIFY_SOURCE=2) endif()