Browse Source

win32 build fix

Signed-off-by: falkTX <falktx@falktx.com>
tags/2021-03-15
falkTX 6 months ago
parent
commit
f5b8a3718e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
8 changed files with 38 additions and 19 deletions
  1. +1
    -1
      .travis/install.sh
  2. +2
    -2
      .travis/script.sh
  3. +17
    -9
      libs/drowaudio/source/dRowAudio/dRowAudio.cpp
  4. +2
    -2
      libs/juce-current/source/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/funknown.cpp
  5. +8
    -4
      libs/juce-legacy/source/modules/juce_audio_utils/juce_audio_utils.cpp
  6. +1
    -1
      meson.build
  7. +3
    -0
      ports/vitalium/source/interface/look_and_feel/paths.h
  8. +4
    -0
      ports/vitalium/source/synthesis/producers/sample_source.cpp

+ 1
- 1
.travis/install.sh View File

@@ -14,7 +14,7 @@ sudo apt-get install -y build-essential meson
if [ "${TARGET}" = "linux" ]; then
sudo apt-get install -y \
pkg-config \
libasound2-dev libfreetype6-dev libgl1-mesa-dev libglu1-mesa-dev \
libasound2-dev libfftw3-dev libfreetype6-dev libgl1-mesa-dev libglu1-mesa-dev \
libx11-dev libxcomposite-dev libxrender-dev libxcursor-dev \
lilv-utils lv2lint kxstudio-lv2-extensions lv2-dev



+ 2
- 2
.travis/script.sh View File

@@ -5,9 +5,9 @@ set -e
export DESTDIR=/tmp/distrho-ports

if [ "${TARGET}" = "win32" ]; then
EXTRA_ARGS="--cross-file scripts/meson/win32.ini -Dbuild-legacy-only=true"
EXTRA_ARGS="--cross-file scripts/meson/win32.ini"
elif [ "${TARGET}" = "win64" ]; then
EXTRA_ARGS="--cross-file scripts/meson/win64.ini -Dbuild-legacy-only=true"
EXTRA_ARGS="--cross-file scripts/meson/win64.ini"
fi

echo "meson build --buildtype=release ${EXTRA_ARGS}"


+ 17
- 9
libs/drowaudio/source/dRowAudio/dRowAudio.cpp View File

@@ -51,8 +51,10 @@
namespace drow {

// Audio
#include "audio/dRowAudio_AudioFilePlayer.cpp"
#include "audio/dRowAudio_AudioFilePlayerExt.cpp"
#if JUCE_MODULE_AVAILABLE_juce_audio_devices
#include "audio/dRowAudio_AudioFilePlayer.cpp"
#include "audio/dRowAudio_AudioFilePlayerExt.cpp"
#endif
#include "audio/dRowAudio_AudioSampleBufferAudioFormat.cpp"

#include "audio/dRowAudio_SoundTouchProcessor.cpp"
@@ -81,22 +83,28 @@ namespace drow {
#include "gui/dRowAudio_AudioFileDropTarget.cpp"
#include "gui/dRowAudio_GraphicalComponent.cpp"
#include "gui/dRowAudio_AudioOscilloscope.cpp"
#include "gui/dRowAudio_AudioTransportCursor.cpp"
#if JUCE_MODULE_AVAILABLE_juce_audio_devices
#include "gui/dRowAudio_AudioTransportCursor.cpp"
#endif
#include "gui/dRowAudio_SegmentedMeter.cpp"
#include "gui/dRowAudio_Sonogram.cpp"
#include "gui/dRowAudio_Spectrograph.cpp"
#include "gui/dRowAudio_Spectroscope.cpp"
#include "gui/dRowAudio_TriggeredScope.cpp"
#include "gui/dRowAudio_CpuMeter.cpp"
#if JUCE_MODULE_AVAILABLE_juce_audio_devices
#include "gui/dRowAudio_CpuMeter.cpp"
#endif
#include "gui/dRowAudio_Clock.cpp"
//#include "gui/dRowAudio_CentreAlignViewport.cpp"
#include "gui/dRowAudio_MusicLibraryTable.cpp"
#include "gui/filebrowser/dRowAudio_BasicFileBrowser.cpp"
#include "gui/filebrowser/dRowAudio_ColumnFileBrowser.cpp"
#include "gui/audiothumbnail/dRowAudio_AudioThumbnailImage.cpp"
#include "gui/audiothumbnail/dRowAudio_ColouredAudioThumbnail.cpp"
#include "gui/audiothumbnail/dRowAudio_PositionableWaveDisplay.cpp"
#include "gui/audiothumbnail/dRowAudio_DraggableWaveDisplay.cpp"
#if JUCE_MODULE_AVAILABLE_juce_audio_devices
#include "gui/audiothumbnail/dRowAudio_AudioThumbnailImage.cpp"
#include "gui/audiothumbnail/dRowAudio_ColouredAudioThumbnail.cpp"
#include "gui/audiothumbnail/dRowAudio_PositionableWaveDisplay.cpp"
#include "gui/audiothumbnail/dRowAudio_DraggableWaveDisplay.cpp"
#endif
#endif

// maths
@@ -124,4 +132,4 @@ namespace drow {
#include "utility/dRowAudio_UnityProjectBuilder.cpp"
#include "parameters/dRowAudio_PluginParameter.cpp"

}
}

+ 2
- 2
libs/juce-current/source/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/base/funknown.cpp View File

@@ -67,11 +67,11 @@ namespace FUnknownPrivate {
//------------------------------------------------------------------------
int32 PLUGIN_API atomicAdd (int32& var, int32 d)
{
#if SMTG_OS_WINDOWS
#if SMTG_OS_WINDOWS && !defined(__MINGW32__)
return InterlockedExchangeAdd (&var, d) + d;
#elif SMTG_OS_MACOS
return OSAtomicAdd32Barrier (d, (int32_t*)&var);
#elif SMTG_OS_LINUX
#elif SMTG_OS_LINUX || defined(__MINGW32__)
__gnu_cxx::__atomic_add (&var, d);
return var;
#else


+ 8
- 4
libs/juce-legacy/source/modules/juce_audio_utils/juce_audio_utils.cpp View File

@@ -57,14 +57,18 @@
#endif
#endif
#include "gui/juce_AudioDeviceSelectorComponent.cpp"
#if JUCE_MODULE_AVAILABLE_juce_audio_devices
#include "gui/juce_AudioDeviceSelectorComponent.cpp"
#endif
#include "gui/juce_AudioThumbnail.cpp"
#include "gui/juce_AudioThumbnailCache.cpp"
#include "gui/juce_AudioVisualiserComponent.cpp"
#include "gui/juce_MidiKeyboardComponent.cpp"
#include "gui/juce_AudioAppComponent.cpp"
#include "players/juce_SoundPlayer.cpp"
#include "players/juce_AudioProcessorPlayer.cpp"
#if JUCE_MODULE_AVAILABLE_juce_audio_devices
#include "gui/juce_AudioAppComponent.cpp"
#include "players/juce_SoundPlayer.cpp"
#include "players/juce_AudioProcessorPlayer.cpp"
#endif
#include "audio_cd/juce_AudioCDReader.cpp"
#if JUCE_MAC


+ 1
- 1
meson.build View File

@@ -101,10 +101,10 @@ elif os_windows
cc.find_library('uuid'),
cc.find_library('version'),
cc.find_library('wininet'),
cc.find_library('winmm'),
cc.find_library('ws2_32'),
]
dependencies_devices = [
cc.find_library('winmm'),
]
else
dependencies = [


+ 3
- 0
ports/vitalium/source/interface/look_and_feel/paths.h View File

@@ -19,6 +19,9 @@
#include "JuceHeader.h"
#include "synth_constants.h"

// some compilers define this..
#undef far

class Paths {
public:
static constexpr int kLogoWidth = 1701;


+ 4
- 0
ports/vitalium/source/synthesis/producers/sample_source.cpp View File

@@ -18,7 +18,11 @@
#include "futils.h"
#include "synth_constants.h"

#ifdef __MINGW32__
#include "mingw-std-threads/mingw.thread.h"
#else
#include <thread>
#endif

namespace vital {



Loading…
Cancel
Save