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

Merge ancillary libraries into main glslang library and stub originals

Browse source
This commit is contained in:
Daniel Story 2024-07-24 17:37:47 -07:00 • committed by arcady-lunarg
parent 0dc6711e5a
commit 4f01996c9d
13 changed files with 181 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

15
glslang/OSDependent/Unix/CMakeLists.txt
View file

@ -31,15 +31,18 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
add_library(OSDependent STATIC ossource.cpp ../osinclude.h)
set(OSDEPENDENT_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/ossource.cpp
PARENT_SCOPE)
set(OSDEPENDENT_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/../osinclude.h
PARENT_SCOPE)
add_library(OSDependent STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../../stub.cpp)
set_property(TARGET OSDependent PROPERTY FOLDER glslang)
set_property(TARGET OSDependent PROPERTY POSITION_INDEPENDENT_CODE ON)
# Link pthread
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
target_link_libraries(OSDependent Threads::Threads)
if(GLSLANG_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS)
install(TARGETS OSDependent EXPORT glslang-targets)
endif()

2
glslang/OSDependent/Web/CMakeLists.txt
View file

@ -34,7 +34,7 @@
if(ENABLE_GLSLANG_JS)
add_executable(glslang.js "glslang.js.cpp")
glslang_set_link_args(glslang.js)
target_link_libraries(glslang.js glslang SPIRV)
target_link_libraries(glslang.js glslang)
# Link library names that start with "-" are treated as link flags.
# "-Os" should be OK in MSVC; don't use /Os because CMake won't

14
glslang/OSDependent/Windows/CMakeLists.txt
View file

@ -31,12 +31,18 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
set(OSDEPENDENT_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/ossource.cpp
PARENT_SCOPE)
set(OSDEPENDENT_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/../osinclude.h
PARENT_SCOPE)
add_library(OSDependent STATIC)
target_sources(OSDependent PRIVATE
../osinclude.h
ossource.cpp
)
${CMAKE_CURRENT_SOURCE_DIR}/../../stub.cpp)
set_property(TARGET OSDependent PROPERTY FOLDER glslang)
set_property(TARGET OSDependent PROPERTY POSITION_INDEPENDENT_CODE ON)
@ -44,7 +50,7 @@ set_property(TARGET OSDependent PROPERTY POSITION_INDEPENDENT_CODE ON)
# MinGW GCC complains about function pointer casts to void*.
# Turn that off with -fpermissive.
if(MINGW AND ${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
target_compile_options(OSDependent PRIVATE -fpermissive)
set_source_files_properties(${OSDEPENDENT_SOURCES} PROPERTIES COMPILE_FLAGS -fpermissive)
endif()
if(WIN32)