diff options
| author | David Pinedo <david@lunarg.com> | 2015-09-08 11:07:46 -0600 |
|---|---|---|
| committer | David Pinedo <david@lunarg.com> | 2015-09-08 11:07:46 -0600 |
| commit | b0b110d86e1bca7563b520cac121db7ca208c17b (patch) | |
| tree | d46edb79650591997631045ffa6adfd1df9c62a3 | |
| parent | 838b5c23add7d20267deb5cdf4d67d23a7e4c718 (diff) | |
| download | usermoji-b0b110d86e1bca7563b520cac121db7ca208c17b.tar.xz | |
Windows build: rename vulkan.0.dll to vulkan-0.dll
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | demos/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | loader/CMakeLists.txt | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d4b9cfad..00a25c50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ project (VULKAN) # set (CMAKE_VERBOSE_MAKEFILE 1) # The MAJOR number of the version we're building, used in naming -# vulkan.<major>.dll (and other files). +# vulkan-<major>.dll (and other files). set(MAJOR "0") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index 954d4065..a17bd833 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -17,7 +17,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_PROTOTYPES") if(WIN32) - set (LIBRARIES "vulkan.${MAJOR}") + set (LIBRARIES "vulkan-${MAJOR}") else () set (LIBRARIES "vulkan") endif() diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index c06d04b2..5dd180d6 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -4,8 +4,8 @@ include_directories( ) if (WIN32) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vulkan.${MAJOR}.def - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/loader/vk-loader-generate.py win-def-file vulkan.${MAJOR}.dll all > ${CMAKE_CURRENT_BINARY_DIR}/vulkan.${MAJOR}.def + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vulkan-${MAJOR}.def + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/loader/vk-loader-generate.py win-def-file vulkan-${MAJOR}.dll all > ${CMAKE_CURRENT_BINARY_DIR}/vulkan-${MAJOR}.def DEPENDS ${PROJECT_SOURCE_DIR}/loader/vk-loader-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py) endif() @@ -32,11 +32,11 @@ set(LOADER_SRCS if (WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS") - add_library(vulkan.${MAJOR} SHARED ${LOADER_SRCS} dirent_on_windows.c ${CMAKE_CURRENT_BINARY_DIR}/vulkan.${MAJOR}.def) - set_target_properties(vulkan.${MAJOR} PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}/vulkan.${MAJOR}.def") + add_library(vulkan-${MAJOR} SHARED ${LOADER_SRCS} dirent_on_windows.c ${CMAKE_CURRENT_BINARY_DIR}/vulkan-${MAJOR}.def) + set_target_properties(vulkan-${MAJOR} PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}/vulkan-${MAJOR}.def") add_library(VKstatic.${MAJOR} STATIC ${LOADER_SRCS} dirent_on_windows.c) set_target_properties(VKstatic.${MAJOR} PROPERTIES OUTPUT_NAME VKstatic.${MAJOR}) - target_link_libraries(vulkan.${MAJOR} shlwapi) + target_link_libraries(vulkan-${MAJOR} shlwapi) endif() if (NOT WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES -Wpointer-arith") |