BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix GLSLANG_IS_SHARED_LIBRARY define

Browse source 
It was incorrectly always being set, causing linker warnings for MSVC builds.
Also simplify the preprocessor nesting in `glslang\Public\ShaderLang.h`
This commit is contained in:
Ben Clayton 2020-07-02 15:54:40 +01:00
parent a70f7dea77
commit cb4788c7a6
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -210,8 +210,8 @@ endif()
# GLSLANG_IS_SHARED_LIBRARY define, and GLSLANG_EXPORTING to 1 when specifically # GLSLANG_IS_SHARED_LIBRARY define, and GLSLANG_EXPORTING to 1 when specifically
# building <target>. # building <target>.
function(glslang_only_export_explicit_symbols target) function(glslang_only_export_explicit_symbols target)
target_compile_definitions(${target} PUBLIC "GLSLANG_IS_SHARED_LIBRARY=1")
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
target_compile_definitions(${target} PUBLIC "GLSLANG_IS_SHARED_LIBRARY=1")
if(WIN32) if(WIN32)
target_compile_definitions(${target} PRIVATE "GLSLANG_EXPORTING=1") target_compile_definitions(${target} PRIVATE "GLSLANG_EXPORTING=1")
else() else()

8
glslang/Public/ShaderLang.h
View file

@ -58,12 +58,12 @@
#endif #endif
#elif __GNUC__ >= 4 #elif __GNUC__ >= 4
#define GLSLANG_EXPORT __attribute__((visibility("default"))) #define GLSLANG_EXPORT __attribute__((visibility("default")))
#else #endif
#endif // GLSLANG_IS_SHARED_LIBRARY
#ifndef GLSLANG_EXPORT
#define GLSLANG_EXPORT #define GLSLANG_EXPORT
#endif #endif
#else // GLSLANG_IS_SHARED_LIBRARY
#define GLSLANG_EXPORT
#endif // GLSLANG_IS_SHARED_LIBRARY
// //
// This is the platform independent interface between an OGL driver // This is the platform independent interface between an OGL driver