Skip to content

Commit 0152722

Browse files
committed
[MSVCRT] Fix build with vista exports
1 parent 994d5e0 commit 0152722

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

dll/win32/msvcrt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ list(APPEND SOURCE
3333
add_library(msvcrt MODULE ${SOURCE})
3434
set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12)
3535
add_dependencies(msvcrt psdk)
36-
target_link_libraries(msvcrt crt wine ${PSEH_LIB})
36+
target_link_libraries(msvcrt crt cpprt wine ${PSEH_LIB})
3737

3838
if(MSVC)
3939
# export of deleting destructor "name"

dll/win32/msvcrt/msvcrt.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
@ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler
242242
@ cdecl -version=0x600+ -arch=x86_64 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler
243243
@ cdecl -arch=arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr)
244-
@ cdecl -version=0x600+ -arch=i386,x86_64 -norelay __CxxFrameHandler3(ptr ptr ptr ptr)
244+
#@ cdecl -version=0x600+ -arch=i386,x86_64 -norelay -private __CxxFrameHandler3(ptr ptr ptr ptr) # Commented out for now, as it causes linker errors
245245
@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr)
246246
@ cdecl -arch=i386 __CxxQueryExceptionSize()
247247
@ cdecl -arch=i386 __CxxRegisterExceptionObject()
@@ -1411,7 +1411,7 @@
14111411
@ cdecl memchr(ptr long long)
14121412
@ cdecl memcmp(ptr ptr long)
14131413
@ cdecl memcpy(ptr ptr long)
1414-
@ stub -version=0x600+ memcpy_s
1414+
@ cdecl -version=0x600+ memcpy_s(ptr long)
14151415
@ cdecl memmove(ptr ptr long)
14161416
@ cdecl -version=0x600+ memmove_s(ptr long ptr long)
14171417
@ cdecl memset(ptr long long)

0 commit comments

Comments
 (0)