Browse Source

Fix mingw build

tags/2018-04-16
falkTX 8 years ago
parent
commit
1bbdec9bce
4 changed files with 7 additions and 3 deletions
  1. +3
    -1
      libs/drowaudio/source/dRowAudio/audio/soundtouch/cpu_detect_x86_win.cpp
  2. +1
    -1
      libs/juce/source/modules/juce_core/files/juce_File.cpp
  3. +1
    -1
      libs/juce/source/modules/juce_core/native/juce_BasicNativeHeaders.h
  4. +2
    -0
      libs/juce/source/modules/juce_core/native/juce_win32_Files.cpp

+ 3
- 1
libs/drowaudio/source/dRowAudio/audio/soundtouch/cpu_detect_x86_win.cpp View File

@@ -42,7 +42,7 @@
#include "cpu_detect.h"
#ifndef WIN32
#ifndef _WIN32
#error wrong platform - this source code file is exclusively for Win32 platform
#endif
@@ -71,6 +71,7 @@ uint detectCPUextensions(void)
if (_dwDisabledISA == 0xffffffff) return 0;
#ifndef __MINGW32__
_asm
{
; check if 'cpuid' instructions is available by toggling eflags bit 21
@@ -124,6 +125,7 @@ uint detectCPUextensions(void)
mov res, esi
}
#endif
return res & ~_dwDisabledISA;
}

+ 1
- 1
libs/juce/source/modules/juce_core/files/juce_File.cpp View File

@@ -911,7 +911,7 @@ bool File::createSymbolicLink (const File& linkFileToCreate, bool overwriteExist
}
return true;
#elif JUCE_WINDOWS
#elif JUCE_MSVC
return CreateSymbolicLink (linkFileToCreate.getFullPathName().toWideCharPointer(),
fullPath.toWideCharPointer(),
isDirectory() ? SYMBOLIC_LINK_FLAG_DIRECTORY : 0) != FALSE;


+ 1
- 1
libs/juce/source/modules/juce_core/native/juce_BasicNativeHeaders.h View File

@@ -114,7 +114,7 @@
#if JUCE_MINGW
#include <basetyps.h>
#include <sys/time.h>
#define alloca __builtin_alloca
#define alloca(x) __builtin_alloca((x))
#else
#include <crtdbg.h>
#include <comutil.h>


+ 2
- 0
libs/juce/source/modules/juce_core/native/juce_win32_Files.cpp View File

@@ -643,6 +643,7 @@ bool File::isShortcut() const
File File::getLinkedTarget() const
{
#if JUCE_MSVC
{
HANDLE h = CreateFile (getFullPathName().toWideCharPointer(),
GENERIC_READ, FILE_SHARE_READ, nullptr,
@@ -676,6 +677,7 @@ File File::getLinkedTarget() const
CloseHandle (h);
}
}
#endif
File result (*this);
String p (getFullPathName());


Loading…
Cancel
Save