Skip to content
This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Commit 8e3791f

Browse files
authored
Merge pull request #262 from TeamWisp/feature_shared_support
Feature shared support
2 parents 1901686 + 782bea5 commit 8e3791f

File tree

13 files changed

+145
-349
lines changed

13 files changed

+145
-349
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/build/
22
/build_vs2017_arm/
33
/build_vs2017_win64/
4+
/build_vs2019_win64/
5+
/build_vs2019_win32/
46
/build_vs2017_win32/
57
*.swp
68
*.swo

CMakeLists.txt

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,17 @@ add_compile_definitions(_ENABLE_EXTENDED_ALIGNED_STORAGE)
55

66
project(Wisp)
77

8-
option(ENABLE_UNIT_TEST "enables unit tests." OFF)
8+
option(WISP_BUILD_SHARED OFF)
9+
if (WISP_BUILD_SHARED)
10+
set(BUILD_SHARED_LIBS ON)
11+
message(STATUS "Building wisp as a SHARED library")
12+
else()
13+
add_definitions(-DWISPRENDERER_STATIC_DEFINE)
14+
message(STATUS "Building wisp as a STATIC library")
15+
set(BUILD_SHARED_LIBS OFF)
16+
endif()
917

10-
option(BUILD_SHARED_LIBS OFF)
18+
option(ENABLE_UNIT_TEST "enables unit tests." OFF)
1119

1220
#Detect whether we have HBAO+ SDK available.
1321
if(EXISTS ${CMAKE_SOURCE_DIR}/deps/hbao+)
@@ -153,7 +161,13 @@ set_target_properties(zlibstatic PROPERTIES FOLDER ThirdParty)
153161
#set_target_properties(unit PROPERTIES FOLDER ThirdParty)
154162
set_target_properties(uninstall PROPERTIES FOLDER ThirdParty)
155163

156-
add_library(WispRenderer STATIC ${HEADERS} ${SOURCES} ${IMGUI_HEADERS} ${IMGUI_SOURCES} ${UTIL_HEADERS} ${UTIL_SOURCES} ${RT_HEADERS} ${RT_SOURCES} ${FG_HEADERS} ${FG_SOURCES} ${SG_HEADERS} ${SG_SOURCES} ${D3D12_SOURCES} ${D3D12_HEADERS})
164+
if(WISP_BUILD_SHARED)
165+
set(WISP_LIB_TYPE SHARED)
166+
else()
167+
set(WISP_LIB_TYPE STATIC)
168+
endif()
169+
170+
add_library(WispRenderer ${WISP_LIB_TYPE} ${HEADERS} ${SOURCES} ${IMGUI_HEADERS} ${IMGUI_SOURCES} ${UTIL_HEADERS} ${UTIL_SOURCES} ${RT_HEADERS} ${RT_SOURCES} ${FG_HEADERS} ${FG_SOURCES} ${SG_HEADERS} ${SG_SOURCES} ${D3D12_SOURCES} ${D3D12_HEADERS})
157171
set_target_properties(WispRenderer PROPERTIES CXX_STANDARD 17)
158172
set_target_properties(WispRenderer PROPERTIES CXX_EXTENSIONS OFF)
159173
set_target_properties(WispRenderer PROPERTIES CMAKE_CXX_STANDARD_REQUIRED ON)

install.bat

Lines changed: 0 additions & 161 deletions
This file was deleted.

install_gameworks.bat

Lines changed: 0 additions & 33 deletions
This file was deleted.

installer.exe

715 KB
Binary file not shown.

reload.bat

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)