azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update mingw_x86 toolchain version and add missing macros to mingw/posix.def

Browse Source
This commit is contained in:
Sergey Bogolepov
2019-02-13 19:02:55 +07:00
committed by Sergey Bogolepov
parent e1d2f783fe
commit dddb55d777
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
konan/konan.properties
+3 -3
View File
@@ -359,14 +359,14 @@ dependencies.mingw_x64 = \
libffi-3.2.1-mingw-w64-x86-64 libffi-3.2.1-mingw-w64-x86-64
# Windows i686, based on mingw-w64. # Windows i686, based on mingw-w64.
targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.3.0-clang-llvm-lld-6.0.1 targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1
dependencies.mingw_x64-mingw_x86 = \ dependencies.mingw_x64-mingw_x86 = \
msys2-mingw-w64-i686-gcc-7.3.0-clang-llvm-lld-6.0.1 \ msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 \
msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \ msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
libffi-3.2.1-mingw-w64-x86-64 libffi-3.2.1-mingw-w64-x86-64
quadruple.mingw_x86 = i686-w64-mingw32 quadruple.mingw_x86 = i686-w64-mingw32
targetSysRoot.mingw_x86 = msys2-mingw-w64-i686-gcc-7.3.0-clang-llvm-lld-6.0.1 targetSysRoot.mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1
# For using with Universal Windows Platform (UWP) we need to use this slower option. # For using with Universal Windows Platform (UWP) we need to use this slower option.
# See https://youtrack.jetbrains.com/issue/KT-27654. # See https://youtrack.jetbrains.com/issue/KT-27654.
# TODO: remove, once fixed in mingw, check with the bug testcase. # TODO: remove, once fixed in mingw, check with the bug testcase.
platformLibs/src/platform/mingw/posix.def
+2
View File
@@ -43,6 +43,7 @@ static short posix_htons(short x) {
#define LPWORD WORD* #define LPWORD WORD*
#define LPLONG __LONG32* #define LPLONG __LONG32*
#define LPDWORD DWORD* #define LPDWORD DWORD*
#define LPTSTR WCHAR*
#define VOID void #define VOID void
#define PVOID void* #define PVOID void*
#define LPVOID void* #define LPVOID void*
@@ -56,6 +57,7 @@ static short posix_htons(short x) {
#define FARPROC void* #define FARPROC void*
#define WINAPI __stdcall #define WINAPI __stdcall
#define CALLBACK __stdcall #define CALLBACK __stdcall
#define PASCAL __pascal
#define _INC_WINDOWS #define _INC_WINDOWS
#define RPC_NO_WINDOWS_H #define RPC_NO_WINDOWS_H