From d229912b5b9c0ac98a6a4339868a67211a7b5912 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Tue, 7 May 2019 03:29:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9VULKAN=E5=BA=93=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                                       | 6 ++----
 res/shader/{shader_compile.bat => shader_compile.sh} | 0
 src/Base/CMakeLists.txt                              | 2 +-
 src/Platform/CMakeLists.txt                          | 2 +-
 src/RenderDevice/Vulkan/CMakeLists.txt               | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)
 rename res/shader/{shader_compile.bat => shader_compile.sh} (100%)
 mode change 100644 => 100755

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d339bf8..18d0ea6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,8 +31,6 @@ else()
     message(FATAL_ERROR "Unsupported Platform!")
 ENDIF()
 
-SET(VULKAN_LIB  ${Vulkan_LIBRARIES})
-
 add_definitions(-DMATH_USE_OPENGL)
 add_definitions(-DMATH_RIGHTHANDED_CAMERA)
 add_definitions(-DMATH_AVX)
@@ -57,9 +55,9 @@ SET(ULRE    ULRE.Base
             ULRE.RenderDevice.Vulkan
             ULRE.Platform
             MathGeoLib
-            ${RENDER_LIBRARY}
             spirv-cross-core
-            ${Vulkan_LIBRARY})
+            ${RENDER_LIBRARY}
+            ${Vulkan_LIBRARIES})
 
 add_subdirectory(example)
 # add_executable(WIP WIP.cpp)
diff --git a/res/shader/shader_compile.bat b/res/shader/shader_compile.sh
old mode 100644
new mode 100755
similarity index 100%
rename from res/shader/shader_compile.bat
rename to res/shader/shader_compile.sh
diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt
index a85737a6..bee646ca 100644
--- a/src/Base/CMakeLists.txt
+++ b/src/Base/CMakeLists.txt
@@ -46,7 +46,7 @@ SET(BASE_PLUG_IN_SOURCE
 
 SOURCE_GROUP("PlugIn" FILES ${BASE_PLUG_IN_SOURCE})
 
-add_library(ULRE.Base STATIC    #${SYSTEM_INFO_SOURCE}
+add_library(ULRE.Base SHARED    #${SYSTEM_INFO_SOURCE}
                                 ${BASE_TYPE_SOURCE}
                                 ${BASE_IO_SOURCE}
                                 ${BASE_FILE_SYSTEM_SOURCE}
diff --git a/src/Platform/CMakeLists.txt b/src/Platform/CMakeLists.txt
index 47c3f659..b116b217 100644
--- a/src/Platform/CMakeLists.txt
+++ b/src/Platform/CMakeLists.txt
@@ -124,4 +124,4 @@ SET(PLATFORM_SOURCE ${PLATFORM_SOURCE}
                     ${PLATFORM_WINDOW_SOURCE}
 )
 
-add_library(ULRE.Platform STATIC ${PLATFORM_SOURCE})
+add_library(ULRE.Platform SHARED ${PLATFORM_SOURCE})
diff --git a/src/RenderDevice/Vulkan/CMakeLists.txt b/src/RenderDevice/Vulkan/CMakeLists.txt
index ed0e78b3..6f5603a1 100644
--- a/src/RenderDevice/Vulkan/CMakeLists.txt
+++ b/src/RenderDevice/Vulkan/CMakeLists.txt
@@ -55,6 +55,6 @@ SOURCE_GROUP("Header Files" FILES ${RENDER_DEVICE_VULKAN_HEADER})
 SOURCE_GROUP("Source Files" FILES ${RENDER_DEVICE_VULKAN_SOURCE})
 #SOURCE_GROUP("JSON Source Files" FILES ${RENDER_DEVICE_VULKAN_JSON_SOURCE})
 
-add_library(ULRE.RenderDevice.Vulkan STATIC ${RENDER_DEVICE_VULKAN_HEADER}
+add_library(ULRE.RenderDevice.Vulkan SHARED ${RENDER_DEVICE_VULKAN_HEADER}
 											${RENDER_DEVICE_VULKAN_SOURCE}
 											${RENDER_DEVICE_VULKAN_JSON_SOURCE})