3 files changed, 10 insertions, 14 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index c4e8779523..0b164a2c56 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -154,16 +154,15 @@ def configure(env):
     env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'AudioUnit', '-framework', 'CoreAudio', '-framework', 'CoreMIDI', '-framework', 'IOKit', '-framework', 'ForceFeedback', '-framework', 'CoreVideo', '-framework', 'AVFoundation', '-framework', 'CoreMedia'])
     env.Append(LIBS=['pthread', 'z'])
 
-    env.Prepend(CPPPATH=['#thirdparty/vulkan/include/', "#thirdparty/vulkan/registry/"])
     env.Append(CPPDEFINES=['VULKAN_ENABLED'])
-
-    #env.Append(CPPDEFINES=['GLES_ENABLED', 'OPENGL_ENABLED'])
-
     env.Append(LINKFLAGS=['-framework', 'Metal', '-framework', 'QuartzCore', '-framework', 'IOSurface'])
     if (env['use_static_mvk']):
         env.Append(LINKFLAGS=['-framework', 'MoltenVK'])
-    elif not env["builtin_vulkan_loader"]:
+        env['builtin_vulkan'] = False
+    elif not env['builtin_vulkan']:
         env.Append(LIBS=['vulkan'])
 
+    #env.Append(CPPDEFINES=['GLES_ENABLED', 'OPENGL_ENABLED'])
+
     env.Append(CCFLAGS=['-mmacosx-version-min=10.11'])
     env.Append(LINKFLAGS=['-mmacosx-version-min=10.11'])
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'])
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index ed48fbb74a..ddb3af79f8 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -320,10 +320,9 @@ def configure(env):
     env.Prepend(CPPPATH=['#platform/x11'])
     env.Append(CPPDEFINES=['X11_ENABLED', 'UNIX_ENABLED'])
 
-    env.Prepend(CPPPATH=['#thirdparty/vulkan/include/', "#thirdparty/vulkan/registry/"])
     env.Append(CPPDEFINES=['VULKAN_ENABLED'])
-    if not env["builtin_vulkan_loader"]:
-        env.Append(LIBS=['vulkan'])
+    if not env['builtin_vulkan']:
+        env.ParseConfig('pkg-config vulkan --cflags --libs')
 
     #env.Append(CPPDEFINES=['OPENGL_ENABLED'])
     env.Append(LIBS=['GL'])