Skip to content

Commit 0820343

Browse files
committed
fix: Windows build
1 parent 1e54018 commit 0820343

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ set(CMAKE_CXX_STANDARD 17)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)
66
set(CMAKE_CXX_EXTENSIONS OFF)
77
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fPIC")
8-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
8+
99
set(VORTEX_VERSION "1.0")
1010
set(VORTEX_FULL_VERSION "1.0.build1")
1111
set(VORTEX_BUILDID "1")
12-
set(VORTEX_BUILDNAME "1.0 [build 1]")
12+
set(VORTEX_BUILDNAME "1.0 [Build 1]")
1313

1414
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/build/dist/${VORTEX_FULL_VERSION} CACHE PATH "Installation directory" FORCE)
1515

1616
set(VORTEX_DIST "beta")
17-
set(VORTEX_BUILD "prod")
17+
set(VORTEX_BUILD "dev")
1818

1919
if (MSVC)
2020
add_compile_options(/utf-8)
@@ -53,6 +53,9 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/lib/spdlog/include")
5353
file(GLOB_RECURSE VORTEX_SHARED_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/main/src/*.cpp")
5454
add_library(vortex_shared SHARED ${VORTEX_SHARED_SOURCES})
5555

56+
set_target_properties(vortex_shared PROPERTIES
57+
WINDOWS_EXPORT_ALL_SYMBOLS ON
58+
)
5659
target_include_directories(vortex_shared PUBLIC
5760
${CMAKE_CURRENT_SOURCE_DIR}/main/include
5861
${CMAKE_CURRENT_SOURCE_DIR}/main/src

build/build.bat

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ cmake -G "Visual Studio 17" -A x64 ..\..
1515
for /f %%i in ('powershell -command "(Get-WmiObject -Class Win32_Processor).NumberOfLogicalProcessors"') do set THREADS=%%i
1616

1717
cmake --build . --config Release -- /m:%THREADS%
18+
cmake --install . --config Release
1819

1920
xcopy /Y /E /I .\bin\Release\* .\bin
20-
cp ..\handle_crash.bat .\bin
21-
21+
xcopy /Y /E /I .\Release\vortex_shared.dll .\bin
22+
xcopy /Y /E /I .\Release\vortex.exe .\bin
23+
xcopy /Y /E /I .\Release\vortex_utils.exe .\bin
24+
xcopy /Y ..\handle_crash.bat .\bin
2225

2326

2427
echo %cd%

manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "1.0 [build 1]",
2+
"name": "1.0 [Build 1]",
33
"build_id": "1",
4-
"full_version": "1.0.1",
4+
"full_version": "1.0.build1",
55
"version": "1.0",
66
"image": "vortex_banner.png"
77
}

0 commit comments

Comments
 (0)