From 99d4a9ca7aa597a9baad281dee0540875b2922a7 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Tue, 31 Oct 2023 05:45:57 +0300 Subject: [PATCH] Disable SIMD when building VB6 version To allow it work on Pentium III processors --- .appveyor.yml | 6 +++--- cmake/DownloadAudioCodecs.cmake | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ad428f6..59b0625 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,14 +4,14 @@ environment: global: PLATFORMTOOLSET: "v140" matrix: - - NAME: MinGW-w64-i686-VB6-SDL.2.0.22-MinSizeRel + - NAME: MinGW-w64-i686-VB6-SDL-Local-MinSizeRel BUILD_TYPE: MinSizeRel COMPILER: MinGW-w32 COMPILER_FAMILY: MinGW GENERATOR: "MinGW Makefiles" PLATFORM: Win32-VB6-Binding IS_VB6_BINDING: YES - EXTRA_CMAKE_FLAGS: "-DMIXERX_ENABLE_GPL=ON -DBUILD_AS_VB6_BINDING=ON -DAUDIO_CODECS_BUILD_LOCAL_SDL2_SHARED=OFF -DAUDIO_CODECS_SDL2_GIT_BRANCH=237348c -DWITH_SDL2_WASAPI=OFF" + EXTRA_CMAKE_FLAGS: "-DMIXERX_ENABLE_GPL=ON -DBUILD_AS_VB6_BINDING=ON -DAUDIOCODECS_DISABLE_SIMD=ON -DAUDIO_CODECS_BUILD_LOCAL_SDL2_SHARED=OFF -DAUDIO_CODECS_BUILD_LOCAL_SDL2=ON" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" - NAME: MinGW-w64-i686-VB6-SDL.2.0.22-MinSizeRel @@ -21,7 +21,7 @@ environment: GENERATOR: "MinGW Makefiles" PLATFORM: Win32-VB6-Binding-SDL-2.0.22 IS_VB6_BINDING: YES - EXTRA_CMAKE_FLAGS: "-DMIXERX_ENABLE_GPL=ON -DBUILD_AS_VB6_BINDING=ON -DAUDIO_CODECS_BUILD_LOCAL_SDL2_SHARED=OFF -DAUDIO_CODECS_SDL2_GIT_BRANCH=237348c -DWITH_SDL2_WASAPI=OFF" + EXTRA_CMAKE_FLAGS: "-DMIXERX_ENABLE_GPL=ON -DBUILD_AS_VB6_BINDING=ON -DAUDIOCODECS_DISABLE_SIMD=ON -DAUDIO_CODECS_BUILD_LOCAL_SDL2_SHARED=OFF -DAUDIO_CODECS_SDL2_GIT_BRANCH=237348c -DWITH_SDL2_WASAPI=OFF" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" # - NAME: MinGW-w64-i686-VB6-SDL.2.0.8-MinSizeRel diff --git a/cmake/DownloadAudioCodecs.cmake b/cmake/DownloadAudioCodecs.cmake index c622644..96a62e8 100644 --- a/cmake/DownloadAudioCodecs.cmake +++ b/cmake/DownloadAudioCodecs.cmake @@ -71,6 +71,8 @@ option(AUDIOCODECS_BUILD_OPNMIDI "Build libOPNMIDI at AudioCodecs" ON) option(AUDIOCODECS_BUILD_EDMIDI "Build libEDMIDI at AudioCodecs" ON) option(AUDIOCODECS_BUILD_WAVPACK "Build WAVPACK at AudioCodecs" ON) +option(AUDIOCODECS_DISABLE_SIMD "Disable any SIMD optimizations as possible in AudioCodecs" OFF) + option(AUDIO_CODECS_BUILD_LOCAL_SDL2_SHARED "Build shared version of SDL2 from local AudioCodecs' copy" ON) ExternalProject_Add( @@ -87,6 +89,7 @@ ExternalProject_Add( "-DDOWNLOAD_SDL2_DEPENDENCY=${AUDIO_CODECS_DOWNLOAD_SDL}" "-DUSE_LOCAL_SDL2=${AUDIO_CODECS_BUILD_LOCAL_SDL2}" "-DBUILD_SDL2_SHARED=${AUDIO_CODECS_BUILD_LOCAL_SDL2_SHARED}" + "-DDISABLE_SIMD=${AUDIOCODECS_DISABLE_SIMD}" ${SDL2_WASAPI_FLAG} ${SDL2_TAGS} ${ADLMIDI_FLAGS}