From 23d6c9453ad5bd92d16abbab8d363be021312414 Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sat, 3 Oct 2020 11:27:33 +0200 Subject: [PATCH 1/4] Update remote of sumodule rpmalloc The remote has changed (it is still redirected, but that may change in the future). So this commit reflects the remote change. You must now run ``` git submodule sync --recursive ``` once to reflect this change. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 8a9871b7a7b..ebc1502e265 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/Lukas-W/qt5-x11embed.git [submodule "src/3rdparty/rpmalloc/rpmalloc"] path = src/3rdparty/rpmalloc/rpmalloc - url = https://github.com/rampantpixels/rpmalloc.git + url = https://github.com/mjansson/rpmalloc.git [submodule "plugins/zynaddsubfx/zynaddsubfx"] path = plugins/zynaddsubfx/zynaddsubfx url = https://github.com/lmms/zynaddsubfx.git From 1e9b89c44cfebbb96a26fff527f5a5e99cb0a233 Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sat, 3 Oct 2020 12:54:47 +0200 Subject: [PATCH 2/4] Update submodule rpmalloc to 1.4.1 Fixes #4752 Fixes #4806 (at least, this is what we think) Helps #5694 --- src/3rdparty/rpmalloc/rpmalloc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/rpmalloc/rpmalloc b/src/3rdparty/rpmalloc/rpmalloc index b5bdc18051b..8d790d2b45e 160000 --- a/src/3rdparty/rpmalloc/rpmalloc +++ b/src/3rdparty/rpmalloc/rpmalloc @@ -1 +1 @@ -Subproject commit b5bdc18051bb74a22f0bde4bcc90b01cf590b496 +Subproject commit 8d790d2b45e1818e531c61bf649c5225556dd07a From 04b840f78d842e3c775257da6f478b98898237f9 Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sun, 4 Oct 2020 23:33:24 +0200 Subject: [PATCH 3/4] Add windows declarations to solve linker errors --- .gitmodules | 2 +- src/3rdparty/rpmalloc/rpmalloc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index ebc1502e265..bf0d4940a5c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/Lukas-W/qt5-x11embed.git [submodule "src/3rdparty/rpmalloc/rpmalloc"] path = src/3rdparty/rpmalloc/rpmalloc - url = https://github.com/mjansson/rpmalloc.git + url = https://github.com/JohannesLorenz/rpmalloc.git [submodule "plugins/zynaddsubfx/zynaddsubfx"] path = plugins/zynaddsubfx/zynaddsubfx url = https://github.com/lmms/zynaddsubfx.git diff --git a/src/3rdparty/rpmalloc/rpmalloc b/src/3rdparty/rpmalloc/rpmalloc index 8d790d2b45e..f20eb7b2720 160000 --- a/src/3rdparty/rpmalloc/rpmalloc +++ b/src/3rdparty/rpmalloc/rpmalloc @@ -1 +1 @@ -Subproject commit 8d790d2b45e1818e531c61bf649c5225556dd07a +Subproject commit f20eb7b2720df235a9d1ada82914844d71d03a83 From 511f2e4d6e5943ab472fc5839b0a543413837d00 Mon Sep 17 00:00:00 2001 From: Dominic Clark Date: Mon, 5 Oct 2020 22:15:26 +0100 Subject: [PATCH 4/4] Set Win32 API version for MinGW --- .gitmodules | 2 +- src/3rdparty/rpmalloc/CMakeLists.txt | 6 ++++++ src/3rdparty/rpmalloc/rpmalloc | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index bf0d4940a5c..ebc1502e265 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/Lukas-W/qt5-x11embed.git [submodule "src/3rdparty/rpmalloc/rpmalloc"] path = src/3rdparty/rpmalloc/rpmalloc - url = https://github.com/JohannesLorenz/rpmalloc.git + url = https://github.com/mjansson/rpmalloc.git [submodule "plugins/zynaddsubfx/zynaddsubfx"] path = plugins/zynaddsubfx/zynaddsubfx url = https://github.com/lmms/zynaddsubfx.git diff --git a/src/3rdparty/rpmalloc/CMakeLists.txt b/src/3rdparty/rpmalloc/CMakeLists.txt index 3b3afa6d329..047c32678c2 100644 --- a/src/3rdparty/rpmalloc/CMakeLists.txt +++ b/src/3rdparty/rpmalloc/CMakeLists.txt @@ -21,6 +21,12 @@ if (NOT LMMS_BUILD_WIN32) ) endif() +if(MINGW) + target_compile_definitions(rpmalloc + PRIVATE -D_WIN32_WINNT=0x600 + ) +endif() + if (CMAKE_BUILD_TYPE STREQUAL "Debug") # rpmalloc uses GCC builtin "__builtin_umull_overflow" with ENABLE_VALIDATE_ARGS, # which is only available starting with GCC 5 diff --git a/src/3rdparty/rpmalloc/rpmalloc b/src/3rdparty/rpmalloc/rpmalloc index f20eb7b2720..8d790d2b45e 160000 --- a/src/3rdparty/rpmalloc/rpmalloc +++ b/src/3rdparty/rpmalloc/rpmalloc @@ -1 +1 @@ -Subproject commit f20eb7b2720df235a9d1ada82914844d71d03a83 +Subproject commit 8d790d2b45e1818e531c61bf649c5225556dd07a