encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make all libraries STATIC for now 

For shared library to work on Windows to work, we need to add
declspec(export) and declspec(import) annotations to the symbols to
export. This fixes the problem by making all libraries static on
Windows, but we'll need to revisit and do proper symbol exports.
This commit is contained in:
Corentin Wallez 2017-05-29 11:21:33 -07:00 committed by Corentin Wallez
parent 5fbdff6888
commit 26275d0a16
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -36,7 +36,7 @@ set(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/include)
Generate( Generate(
LIB_NAME nxt LIB_NAME nxt
LIB_TYPE SHARED LIB_TYPE STATIC
PRINT_NAME libNXT PRINT_NAME libNXT
COMMAND_LINE_ARGS COMMAND_LINE_ARGS
${GENERATOR_COMMON_ARGS} ${GENERATOR_COMMON_ARGS}
@ -46,7 +46,7 @@ target_include_directories(nxt PUBLIC ${GENERATED_DIR})
Generate( Generate(
LIB_NAME nxtcpp LIB_NAME nxtcpp
LIB_TYPE SHARED LIB_TYPE STATIC
PRINT_NAME libNXT++ PRINT_NAME libNXT++
COMMAND_LINE_ARGS COMMAND_LINE_ARGS
${GENERATOR_COMMON_ARGS} ${GENERATOR_COMMON_ARGS}
@ -58,7 +58,7 @@ SetCXX14(nxtcpp)
Generate( Generate(
LIB_NAME mock_nxt LIB_NAME mock_nxt
LIB_TYPE SHARED LIB_TYPE STATIC
PRINT_NAME libMockNXT PRINT_NAME libMockNXT
COMMAND_LINE_ARGS COMMAND_LINE_ARGS
${GENERATOR_COMMON_ARGS} ${GENERATOR_COMMON_ARGS}

2
examples/CMakeLists.txt
View File

@ -24,7 +24,7 @@ if (APPLE)
) )
endif() endif()
add_library(utils SHARED ${UTILS_SOURCES}) add_library(utils STATIC ${UTILS_SOURCES})
target_link_libraries(utils nxt_backend nxt_wire shaderc nxtcpp nxt) target_link_libraries(utils nxt_backend nxt_wire shaderc nxtcpp nxt)
SetCXX14(utils) SetCXX14(utils)

2
generator/CMakeLists.txt
View File

@ -22,7 +22,7 @@ execute_process(
RESULT_VARIABLE RET RESULT_VARIABLE RET
) )
if (NOT RET EQUAL 0) if (NOT RET EQUAL 0)
message(FATAL_ERROR "Missing dependencies for VkCPP generation, please ensure you have python-jinja2 installed.") message(FATAL_ERROR "Missing dependencies for code generation, please ensure you have python-jinja2 installed.")
endif() endif()
function(Generate) function(Generate)

2
src/backend/CMakeLists.txt
View File

@ -138,7 +138,7 @@ if (APPLE)
) )
endif() endif()
add_library(nxt_backend SHARED ${BACKEND_SOURCES}) add_library(nxt_backend STATIC ${BACKEND_SOURCES})
target_link_libraries(nxt_backend opengl_autogen null_autogen glfw glad spirv-cross) target_link_libraries(nxt_backend opengl_autogen null_autogen glfw glad spirv-cross)
if (APPLE) if (APPLE)
target_link_libraries(nxt_backend metal_autogen) target_link_libraries(nxt_backend metal_autogen)

2
src/wire/CMakeLists.txt
View File

@ -30,7 +30,7 @@ target_link_libraries(wire_autogen nxt)
SetCXX14(wire_autogen) SetCXX14(wire_autogen)
SetPic(wire_autogen) SetPic(wire_autogen)
add_library(nxt_wire SHARED add_library(nxt_wire STATIC
${WIRE_DIR}/TerribleCommandBuffer.h ${WIRE_DIR}/TerribleCommandBuffer.h
${WIRE_DIR}/WireCmd.cpp ${WIRE_DIR}/WireCmd.cpp
${WIRE_DIR}/WireCmd.h ${WIRE_DIR}/WireCmd.h

4
third_party/CMakeLists.txt vendored
View File

@ -29,7 +29,7 @@ find_package(Threads)
target_link_libraries(gtest ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(gtest ${CMAKE_THREAD_LIBS_INIT})
# Glad # Glad
add_library(glad SHARED add_library(glad STATIC
${CMAKE_CURRENT_SOURCE_DIR}/glad/src/glad.c ${CMAKE_CURRENT_SOURCE_DIR}/glad/src/glad.c
${CMAKE_CURRENT_SOURCE_DIR}/glad/include/glad/glad.h ${CMAKE_CURRENT_SOURCE_DIR}/glad/include/glad/glad.h
${CMAKE_CURRENT_SOURCE_DIR}/glad/include/KHR/khrplatform.h ${CMAKE_CURRENT_SOURCE_DIR}/glad/include/KHR/khrplatform.h
@ -48,7 +48,7 @@ SetPIC(shaderc)
SetPIC(shaderc_util) SetPIC(shaderc_util)
# SPIRV-Cross # SPIRV-Cross
add_library(spirv-cross SHARED add_library(spirv-cross STATIC
${CMAKE_CURRENT_SOURCE_DIR}/spirv-cross/GLSL.std.450.h ${CMAKE_CURRENT_SOURCE_DIR}/spirv-cross/GLSL.std.450.h
${CMAKE_CURRENT_SOURCE_DIR}/spirv-cross/spirv_common.hpp ${CMAKE_CURRENT_SOURCE_DIR}/spirv-cross/spirv_common.hpp
${CMAKE_CURRENT_SOURCE_DIR}/spirv-cross/spirv_cfg.cpp ${CMAKE_CURRENT_SOURCE_DIR}/spirv-cross/spirv_cfg.cpp