Home Explore Help
Sign In
khronosschoty
/
orbea-SlackBuilds
forked from orbea/SlackBuilds
Watch 1
Star 0
Fork 0
Files
Branch: experimental
Branches Tags
orbea-SlackB...
/
graphics
/
shaderc
/
fix-glslang-link-order.patch

fix-glslang-link-order.patch 1.7 KB
Permalink History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445 
  1. From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Niklas Haas <git@haasn.xyz>
    3. 

  3. Date: Tue, 29 May 2018 07:34:00 +0200
    4. 

  4. Subject: [PATCH] Fix the link order of libglslang and libHLSL
    5. 

  5. 

  6. libglslang depends on libHLSL, so the latter needs to be specified last.
    7. 

  7. This fixes an issue when trying to build shaderc against system-wide
    8. 

  8. versions of libglslang/libHLSL, rather than the in-tree versions from
    9. 

  9. third_party.
    10. 

  10. 

  11. Additionally, libshaderc_util also depends on SPIRV-Tools
    12. 

  12. ---
    13. 

  13.  glslc/CMakeLists.txt           | 2 +-
    14. 

  14.  libshaderc_util/CMakeLists.txt | 4 ++--
    15. 

  15.  2 files changed, 3 insertions(+), 3 deletions(-)
    16. 

  16. 

  17. diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
    18. 

  18. index acf6fb0..0f5d888 100644
    19. 

  19. --- a/glslc/CMakeLists.txt
    20. 

  20. +++ b/glslc/CMakeLists.txt
    21. 

  21. @@ -18,7 +18,7 @@ add_library(glslc STATIC
    22. 

  22.  shaderc_default_compile_options(glslc)
    23. 

  23.  target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
    24. 

  24.  target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
    25. 

  25. -  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
    26. 

  26. +  glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
    27. 

  27.  target_link_libraries(glslc PRIVATE shaderc_util shaderc)
    28. 

  28.  
    29. 

  29.  add_executable(glslc_exe src/main.cc)
    30. 

  30. diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
    31. 

  31. index 873540a..6d0c465 100644
    32. 

  32. --- a/libshaderc_util/CMakeLists.txt
    33. 

  33. +++ b/libshaderc_util/CMakeLists.txt
    34. 

  34. @@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL)
    35. 

  35.  
    36. 

  36.  find_package(Threads)
    37. 

  37.  target_link_libraries(shaderc_util PRIVATE
    38. 

  38. -  glslang OSDependent OGLCompiler HLSL glslang SPIRV
    39. 

  39. -  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
    40. 

  40. +  glslang OSDependent OGLCompiler glslang HLSL SPIRV
    41. 

  41. +  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
    42. 

  42.  
    43. 

  43.  shaderc_add_tests(
    44. 

  44.    TEST_PREFIX shaderc_util
    45. 

  45.