Browse Source

Cleanup last few build details

Signed-off-by: falkTX <falktx@falktx.com>
tags/24.04
falkTX 2 years ago
parent
commit
60d2651f2e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
13 changed files with 34 additions and 25 deletions
  1. +2
    -1
      .github/workflows/build.yml
  2. +0
    -3
      Makefile
  3. +1
    -1
      Makefile.base.mk
  4. +6
    -0
      deps/Makefile
  5. +1
    -1
      include/simd-compat/emmintrin.h
  6. +2
    -0
      include/simd-compat/immintrin.h
  7. +1
    -1
      include/simd-compat/mmintrin.h
  8. +1
    -1
      include/simd-compat/pmmintrin.h
  9. +14
    -0
      include/simd-compat/simd-compat.h
  10. +1
    -1
      include/simd-compat/smmintrin.h
  11. +1
    -1
      include/simd-compat/tmmintrin.h
  12. +1
    -1
      include/simd-compat/xmmintrin.h
  13. +3
    -14
      src/override/common.cpp

+ 2
- 1
.github/workflows/build.yml View File

@@ -417,7 +417,7 @@ jobs:
- name: Set up dependencies - name: Set up dependencies
run: | run: |
./deps/PawPaw/.github/workflows/bootstrap-deps.sh ${{ matrix.target }} ./deps/PawPaw/.github/workflows/bootstrap-deps.sh ${{ matrix.target }}
apt-get install -yqq wget zip
apt-get install -yqq wget xvfb zip
apt-get clean apt-get clean
- name: Set up ccache - name: Set up ccache
uses: hendrikmuhs/ccache-action@v1.2 uses: hendrikmuhs/ccache-action@v1.2
@@ -458,6 +458,7 @@ jobs:
run: echo "SHA8=$(echo ${{ github.ref_name }})" >> $GITHUB_ENV run: echo "SHA8=$(echo ${{ github.ref_name }})" >> $GITHUB_ENV
- name: Pack binaries - name: Pack binaries
if: steps.cache.outputs.cache-hit == 'true' if: steps.cache.outputs.cache-hit == 'true'
shell: bash
run: | run: |
pushd bin pushd bin
zip -r -9 ../${{ github.event.repository.name }}-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap) zip -r -9 ../${{ github.event.repository.name }}-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap)


+ 0
- 3
Makefile View File

@@ -268,9 +268,6 @@ clean:
$(MAKE) clean -C plugins $(MAKE) clean -C plugins
$(MAKE) clean -C src $(MAKE) clean -C src
rm -rf bin build build-headless dpf/utils/lv2_ttl_generator.d rm -rf bin build build-headless dpf/utils/lv2_ttl_generator.d
# FIXME
rm -f src/Rack/BaconMusic/default-skin.json
rm -f src/Rack/SurgeXTRack/default-skin.json


# -------------------------------------------------------------- # --------------------------------------------------------------
# Install step # Install step


+ 1
- 1
Makefile.base.mk View File

@@ -73,7 +73,7 @@ BASE_FLAGS += -msse -msse2 -msse3 -msimd128
else ifeq ($(CPU_ARM32),true) else ifeq ($(CPU_ARM32),true)
BASE_FLAGS += -mfpu=neon-vfpv4 -mfloat-abi=hard BASE_FLAGS += -mfpu=neon-vfpv4 -mfloat-abi=hard
else ifeq ($(CPU_I386_OR_X86_64),true) else ifeq ($(CPU_I386_OR_X86_64),true)
BASE_FLAGS += -msse -msse2 -msse3 -mfpmath=sse
BASE_FLAGS += -msse -msse2 -msse3
endif endif


ifeq ($(SYSDEPS),true) ifeq ($(SYSDEPS),true)


+ 6
- 0
deps/Makefile View File

@@ -335,6 +335,12 @@ clean:
rm -rf $(RACK_DEP_PATH)/jansson-2.12 rm -rf $(RACK_DEP_PATH)/jansson-2.12
rm -rf $(RACK_DEP_PATH)/libarchive-3.4.3 rm -rf $(RACK_DEP_PATH)/libarchive-3.4.3
rm -rf $(RACK_DEP_PATH)/libsamplerate-0.1.9 rm -rf $(RACK_DEP_PATH)/libsamplerate-0.1.9
rm -rf $(RACK_DEP_PATH)/speexdsp/autom4te.cache
rm -rf $(RACK_DEP_PATH)/speexdsp/libspeexdsp/.deps
rm -rf $(RACK_DEP_PATH)/speexdsp/libspeexdsp/.libs
rm -rf $(RACK_DEP_PATH)/speexdsp/libspeexdsp/*.lo
rm -rf $(RACK_DEP_PATH)/speexdsp/libspeexdsp/*.o
rm -rf $(RACK_DEP_PATH)/speexdsp/Makefile
rm -rf $(RACK_DEP_PATH)/zstd-1.4.5 rm -rf $(RACK_DEP_PATH)/zstd-1.4.5
rm -rf $(SURGE_DEP_PATH) rm -rf $(SURGE_DEP_PATH)




+ 1
- 1
include/simd-compat/emmintrin.h View File

@@ -8,7 +8,7 @@


#include "simd-compat.h" #include "simd-compat.h"


#ifdef SIMDE_X86_SSE2_NATIVE
#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_SSE2_NATIVE)
# include_next <emmintrin.h> # include_next <emmintrin.h>
#else #else
# include "mmintrin.h" # include "mmintrin.h"


+ 2
- 0
include/simd-compat/immintrin.h View File

@@ -9,7 +9,9 @@
#include "simd-compat.h" #include "simd-compat.h"


#ifdef SIMDE_X86_SSE_NATIVE #ifdef SIMDE_X86_SSE_NATIVE
# define CARDINAL_INCLUDING_IMMINTRIN_H
# include_next <immintrin.h> # include_next <immintrin.h>
# undef CARDINAL_INCLUDING_IMMINTRIN_H
#else #else
# include "mmintrin.h" # include "mmintrin.h"
# include "xmmintrin.h" # include "xmmintrin.h"


+ 1
- 1
include/simd-compat/mmintrin.h View File

@@ -8,7 +8,7 @@


#include "simd-compat.h" #include "simd-compat.h"


#ifdef SIMDE_X86_MMX_NATIVE
#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_MMX_NATIVE)
# include_next <mmintrin.h> # include_next <mmintrin.h>
#else #else
# define SIMDE_ENABLE_NATIVE_ALIASES # define SIMDE_ENABLE_NATIVE_ALIASES


+ 1
- 1
include/simd-compat/pmmintrin.h View File

@@ -8,7 +8,7 @@


#include "simd-compat.h" #include "simd-compat.h"


#ifdef SIMDE_X86_SSE3_NATIVE
#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_SSE3_NATIVE)
# include_next <pmmintrin.h> # include_next <pmmintrin.h>
#else #else
# include "mmintrin.h" # include "mmintrin.h"


+ 14
- 0
include/simd-compat/simd-compat.h View File

@@ -50,3 +50,17 @@
# define SIMDE_WASM_SIMD128_NATIVE # define SIMDE_WASM_SIMD128_NATIVE
# endif # endif
#endif #endif

// fix win32 build
#ifdef _WIN32
static inline
float simde_math_roundevenf(float v) {
float rounded = __builtin_roundf(v);
float diff = rounded - v;
if (__builtin_expect(!!(__builtin_fabsf(diff) == 0.5f) && ((int)rounded & 1), 0)) {
rounded = v - diff;
}
return rounded;
}
#define simde_math_roundevenf simde_math_roundevenf
#endif

+ 1
- 1
include/simd-compat/smmintrin.h View File

@@ -8,7 +8,7 @@


#include "simd-compat.h" #include "simd-compat.h"


#ifdef SIMDE_X86_SSE4_1_NATIVE
#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_SSE4_1_NATIVE)
# include_next <smmintrin.h> # include_next <smmintrin.h>
#else #else
# include "mmintrin.h" # include "mmintrin.h"


+ 1
- 1
include/simd-compat/tmmintrin.h View File

@@ -8,7 +8,7 @@


#include "simd-compat.h" #include "simd-compat.h"


#ifdef SIMDE_X86_SSSE3_NATIVE
#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_SSSE3_NATIVE)
# include_next <tmmintrin.h> # include_next <tmmintrin.h>
#else #else
# include "mmintrin.h" # include "mmintrin.h"


+ 1
- 1
include/simd-compat/xmmintrin.h View File

@@ -8,7 +8,7 @@


#include "simd-compat.h" #include "simd-compat.h"


#ifdef SIMDE_X86_SSE_NATIVE
#if defined(CARDINAL_INCLUDING_IMMINTRIN_H) || defined(SIMDE_X86_SSE_NATIVE)
# include_next <xmmintrin.h> # include_next <xmmintrin.h>
#else #else
# include "mmintrin.h" # include "mmintrin.h"


+ 3
- 14
src/override/common.cpp View File

@@ -1,18 +1,7 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 3 of
* the License, or any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* For a full copy of the GNU General Public License see the LICENSE file.
* Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
* SPDX-License-Identifier: GPL-3.0-or-later
*/ */


/** /**
@@ -63,7 +52,7 @@ const std::string APP_NAME = "Cardinal";
const std::string APP_EDITION = getPluginFormatName(); const std::string APP_EDITION = getPluginFormatName();
const std::string APP_EDITION_NAME = "Audio Plugin"; const std::string APP_EDITION_NAME = "Audio Plugin";
const std::string APP_VERSION_MAJOR = "2"; const std::string APP_VERSION_MAJOR = "2";
const std::string APP_VERSION = "2.3.0";
const std::string APP_VERSION = "2.4.1";
#if defined ARCH_WIN #if defined ARCH_WIN
const std::string APP_OS = "win"; const std::string APP_OS = "win";
#elif defined ARCH_MAC #elif defined ARCH_MAC


Loading…
Cancel
Save