Browse Source

More juce tweaks, import riscv/wasm fixes

pull/1748/head
falkTX 1 year ago
parent
commit
798885136a
4 changed files with 7 additions and 5 deletions
  1. +2
    -0
      source/modules/juce_core/juce_core.cpp
  2. +2
    -2
      source/modules/juce_core/system/juce_TargetPlatform.h
  3. +1
    -1
      source/modules/juce_dsp/juce_dsp.cpp
  4. +2
    -2
      source/modules/juce_dsp/juce_dsp.h

+ 2
- 0
source/modules/juce_core/juce_core.cpp View File

@@ -73,6 +73,7 @@
#endif
#if JUCE_WASM
#include <emscripten.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -240,6 +241,7 @@
#include "files/juce_common_MimeTypes.cpp"
#include "threads/juce_HighResolutionTimer.cpp"
#include "threads/juce_WaitableEvent.cpp"
#include "network/juce_URL.cpp"
#if ! JUCE_WASM
#include "threads/juce_ChildProcess.cpp"


+ 2
- 2
source/modules/juce_core/system/juce_TargetPlatform.h View File

@@ -46,6 +46,8 @@
#define JUCE_ANDROID 1
#elif defined (__FreeBSD__) || (__OpenBSD__)
#define JUCE_BSD 1
#elif defined (__wasm__)
#define JUCE_WASM 1
#elif defined (LINUX) || defined (__linux__)
#define JUCE_LINUX 1
#elif defined (__APPLE_CPP__) || defined (__APPLE_CC__)
@@ -59,8 +61,6 @@
#else
#define JUCE_MAC 1
#endif
#elif defined (__wasm__)
#define JUCE_WASM 1
#else
#error "Unknown platform!"
#endif


+ 1
- 1
source/modules/juce_dsp/juce_dsp.cpp View File

@@ -79,7 +79,7 @@
#include "widgets/juce_Chorus.cpp"
#if JUCE_USE_SIMD
#if defined(__i386__) || defined(__amd64__) || defined(_M_X64) || defined(_X86_) || defined(_M_IX86)
#if defined(__i386__) || defined(__amd64__) || defined(_M_X64) || defined(_X86_) || defined(_M_IX86) || defined(__riscv) || defined(__EMSCRIPTEN__)
#ifdef __AVX2__
#include "native/juce_avx_SIMDNativeOps.cpp"
#else


+ 2
- 2
source/modules/juce_dsp/juce_dsp.h View File

@@ -58,7 +58,7 @@
#include <juce_audio_basics/juce_audio_basics.h>
#include <juce_audio_formats/juce_audio_formats.h>
#if defined(_M_X64) || defined(__amd64__) || defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP == 2)
#if defined(_M_X64) || defined(__amd64__) || defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP == 2) || defined(__riscv) || defined(__EMSCRIPTEN__)
#if defined(_M_X64) || defined(__amd64__)
#ifndef __SSE2__
@@ -221,7 +221,7 @@ namespace juce
#include "native/juce_fallback_SIMDNativeOps.h"
// include the correct native file for this build target CPU
#if defined(__i386__) || defined(__amd64__) || defined(_M_X64) || defined(_X86_) || defined(_M_IX86)
#if defined(__i386__) || defined(__amd64__) || defined(_M_X64) || defined(_X86_) || defined(_M_IX86) || defined(__riscv) || defined(__EMSCRIPTEN__)
#ifdef __AVX2__
#include "native/juce_avx_SIMDNativeOps.h"
#else


Loading…
Cancel
Save