From 08b4faef01da5207b1a864c90d1ca4353bd1e232 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 19 May 2020 12:28:19 -0600 Subject: Properly fix: T71040 / T58983 Ocean Modifier crashes at high resolutions For a more detailed description of the issue see the commit message for rB497cd3d7dd6e497be484eb78a8ddb23f53b20343 This change moves fftw to a shared library and reverts the bandaid we did for 2.83. --- source/creator/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source/creator/CMakeLists.txt') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index b3e83b1412f..1a71022869a 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -687,6 +687,13 @@ elseif(WIN32) ) endif() + if(WITH_FFTW3) + install( + FILES ${LIBDIR}/fftw3/lib/libfftw3-3.dll + DESTINATION "." + ) + endif() + if(WITH_WINDOWS_PDB) if(WITH_WINDOWS_STRIPPED_PDB) # Icky hack for older cmake from https://stackoverflow.com/a/21198501 -- cgit v1.2.3