Skip to content

Commit be05b23

Browse files
committed
fix obj path on windows
1 parent 4e5a6d2 commit be05b23

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ if (MI_BUILD_OBJECT)
634634
)
635635

636636
# Copy the generated object file (`static.o`) to the output directory (as `mimalloc.o`)
637-
if(WIN32)
637+
if(CMAKE_GENERATOR MATCHES "^Visual Studio.*$")
638638
set(mimalloc-obj-static "${CMAKE_CURRENT_BINARY_DIR}/mimalloc-obj.dir/$<CONFIG>/static${CMAKE_C_OUTPUT_EXTENSION}")
639639
else()
640640
set(mimalloc-obj-static "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION}")

contrib/vcpkg/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ target_link_libraries(main PRIVATE mimalloc)
2828

2929
# Acknowledgements
3030

31-
The original port for vckpg was contributed by various people, including: @vicroms, @myd7349, @PhoubeHui, @LilyWangL,
31+
The original port for vckpg was contributed by many people, including: @vicroms, @myd7349, @PhoubeHui, @LilyWangL,
3232
@JonLiu1993, @RT2Code, Remy Tassoux, @wangao, @BillyONeal, @jiayuehua, @dg0yt, @gerar-ryan-immersaview, @nickdademo,
3333
and @jimwang118 -- Thank you so much!
3434

0 commit comments

Comments
 (0)