commit 4bb0d30b4ae101d9ba83801fbd173f3fb991a0b8
author David Pinedo <david@lunarg.com> Tue Sep 08 11:07:46 2015 -0600
committer David Pinedo <david@lunarg.com> Tue Sep 08 11:07:46 2015 -0600
tree 6de1eda5a309f9c57f338ca55f9264a9f8417eb0
parent eafbbbe32ea722cf987991660de76adb6f68eb44

Windows build: rename vulkan.0.dll to vulkan-0.dll

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4b9cfa..00a25c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
 # 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")

loader/CMakeLists.txt

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index c06d04b..5dd180d 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -4,8 +4,8 @@
 )
 
 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 @@
 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")

tests/CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f9e3e62..2369735 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -110,7 +110,7 @@
 endif()
 
 if (WIN32)
-    set (LIBVK "vulkan.${MAJOR}")
+    set (LIBVK "vulkan-${MAJOR}")
 else ()
     set (LIBVK "vulkan")
 endif()