Merge branch 'master' into develop

This commit is contained in:
saschawillems 2017-08-22 18:56:05 +02:00
commit c2aef7809f
2 changed files with 20 additions and 8 deletions

10
base/CMakeLists.txt Normal file
View file

@ -0,0 +1,10 @@
file(GLOB BASE_SRC *.cpp)
file(GLOB BASE_HEADERS *.hpp)
if(WIN32)
add_library(base STATIC ${BASE_SRC})
target_link_libraries(base ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WINLIBS})
else(WIN32)
add_library(base STATIC ${BASE_SRC})
target_link_libraries(base ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${XCB_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
endif(WIN32)