mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2309 from ben-clayton/fix-msvc-linker-warnings

Browse Source 
Fix GLSLANG_IS_SHARED_LIBRARY define
This commit is contained in:
John Kessenich 2020-07-02 23:32:01 -06:00 committed by GitHub
commit ed3d5dbe99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats 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