diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-05 11:48:54 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-11 11:59:04 +0100 |
| commit | 511f65214fcc95011525e2f23e4d1be7cd7b8731 (patch) | |
| tree | b9ab281613cc08c3a41767a5e342fadc85821178 /platform/windows | |
| parent | 324082471de5e923fe8d03e43085ea52e1f117e4 (diff) | |
SCons: Streamline Vulkan buildsystem + fixups
- Renamed option to `builtin_vulkan`, since that's the name of the
library and if we were to add new components, we'd likely use that
same option.
- Merge `vulkan_loader/SCsub` in `vulkan/SCsub`.
- Accordingly, don't use built-in Vulkan headers when not building
against the built-in loader library.
- Drop Vulkan registry which we don't appear to need currently.
- Style and permission fixes.
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/detect.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 0b65565a37..3ab0d38a6a 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -224,9 +224,8 @@ def configure_msvc(env, manual_msvc_config): 'shell32', 'advapi32', 'dinput8', 'dxguid', 'imm32', 'bcrypt', 'Avrt', 'dwmapi'] - env.Prepend(CPPPATH=['#thirdparty/vulkan/include/', "#thirdparty/vulkan/registry/"]) - env.AppendUnique(CPPDEFINES = ['VULKAN_ENABLED']) - if not env["builtin_vulkan_loader"]: + env.AppendUnique(CPPDEFINES=['VULKAN_ENABLED']) + if not env['builtin_vulkan']: LIBS += ['vulkan'] else: LIBS += ['cfgmgr32'] @@ -361,13 +360,12 @@ def configure_mingw(env): env.Append(CPPDEFINES=[('WINVER', env['target_win_version']), ('_WIN32_WINNT', env['target_win_version'])]) env.Append(LIBS=['mingw32', 'dsound', 'ole32', 'd3d9', 'winmm', 'gdi32', 'iphlpapi', 'shlwapi', 'wsock32', 'ws2_32', 'kernel32', 'oleaut32', 'dinput8', 'dxguid', 'ksuser', 'imm32', 'bcrypt', 'avrt', 'uuid', 'dwmapi']) - env.Prepend(CPPPATH=['#thirdparty/vulkan/include/', "#thirdparty/vulkan/registry/"]) env.Append(CPPDEFINES=['VULKAN_ENABLED']) - if not env["builtin_vulkan_loader"]: + if not env['builtin_vulkan']: env.Append(LIBS=['vulkan']) else: env.Append(LIBS=['cfgmgr32']) - + ## TODO !!! Reenable when OpenGLES Rendering Device is implemented !!! #env.Append(CPPDEFINES=['OPENGL_ENABLED']) env.Append(LIBS=['opengl32']) |