diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-23 23:17:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 23:17:01 +0200 |
| commit | 70f318be555c9d0e771d56b1c068999c06ea121d (patch) | |
| tree | bfe33c1ba5f5000272f70e56c78fd255c7c52cb0 | |
| parent | 325f6c6581ab4a22665ca59cd9859b6605a58841 (diff) | |
| parent | 5c5c3a590a63a836fa03648ff39dd43acccdade0 (diff) | |
Merge pull request #28342 from KLee1248/fix_build
Fixes build for Windows cross-compilation
| -rw-r--r-- | platform/windows/detect.py | 2 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 2f7334657f..e986c47b40 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -330,7 +330,7 @@ def configure_mingw(env): env.Append(CCFLAGS=['-DWASAPI_ENABLED']) env.Append(CCFLAGS=['-DWINMIDI_ENABLED']) env.Append(CCFLAGS=['-DWINVER=%s' % env['target_win_version'], '-D_WIN32_WINNT=%s' % env['target_win_version']]) - env.Append(LIBS=['mingw32', 'opengl32', 'dsound', 'ole32', 'd3d9', 'winmm', 'gdi32', 'iphlpapi', 'shlwapi', 'wsock32', 'ws2_32', 'kernel32', 'oleaut32', 'dinput8', 'dxguid', 'ksuser', 'imm32', 'bcrypt','avrt']) + env.Append(LIBS=['mingw32', 'opengl32', 'dsound', 'ole32', 'd3d9', 'winmm', 'gdi32', 'iphlpapi', 'shlwapi', 'wsock32', 'ws2_32', 'kernel32', 'oleaut32', 'dinput8', 'dxguid', 'ksuser', 'imm32', 'bcrypt', 'avrt', 'uuid']) env.Append(CPPFLAGS=['-DMINGW_ENABLED']) diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 0c3d8af220..a6a947761b 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -53,6 +53,7 @@ #include <avrt.h> #include <direct.h> +#include <knownfolders.h> #include <process.h> #include <regstr.h> #include <shlobj.h> |