Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRT] Add crtmath library

Browse source
This commit is contained in:
Timo Kreuzer 2025-05-07 18:33:10 +03:00
parent 4866a25a8f
commit 35bc1e1d9e
5 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dll/win32/ucrtbase/CMakeLists.txt
View file

@ -36,6 +36,7 @@ set_entrypoint(ucrtbase __acrt_DllMain 12)
target_link_libraries(ucrtbase target_link_libraries(ucrtbase
ucrt ucrt
ucrtsupport ucrtsupport
crtmath
vcruntime vcruntime
wine wine
) )

1
sdk/lib/crt/CMakeLists.txt
View file

@ -25,6 +25,7 @@ include(wine/wine.cmake)
include(wstring/wstring.cmake) include(wstring/wstring.cmake)
include(crt.cmake) include(crt.cmake)
include(crtmath.cmake)
include(libcntpr.cmake) include(libcntpr.cmake)
include(msvcrtex.cmake) include(msvcrtex.cmake)
include(oldnames.cmake) include(oldnames.cmake)

5
sdk/lib/crt/crt.cmake
View file

@ -3,9 +3,7 @@ list(APPEND CRT_SOURCE
${CRT_CONIO_SOURCE} ${CRT_CONIO_SOURCE}
${CRT_DIRECT_SOURCE} ${CRT_DIRECT_SOURCE}
${CRT_EXCEPT_SOURCE} ${CRT_EXCEPT_SOURCE}
${CRT_FLOAT_SOURCE}
locale/locale.c locale/locale.c
${CRT_MATH_SOURCE}
${CRT_MBSTRING_SOURCE} ${CRT_MBSTRING_SOURCE}
${CRT_MEM_SOURCE} ${CRT_MEM_SOURCE}
${CRT_MISC_SOURCE} ${CRT_MISC_SOURCE}
@ -25,8 +23,6 @@ list(APPEND CRT_SOURCE
list(APPEND CRT_ASM_SOURCE list(APPEND CRT_ASM_SOURCE
${CRT_EXCEPT_ASM_SOURCE} ${CRT_EXCEPT_ASM_SOURCE}
${CRT_FLOAT_ASM_SOURCE}
${CRT_MATH_ASM_SOURCE}
${CRT_SETJMP_ASM_SOURCE} ${CRT_SETJMP_ASM_SOURCE}
${CRT_STDLIB_ASM_SOURCE} ${CRT_STDLIB_ASM_SOURCE}
${CRT_STRING_ASM_SOURCE} ${CRT_STRING_ASM_SOURCE}
@ -38,6 +34,7 @@ add_asm_files(crt_asm ${CRT_ASM_SOURCE})
add_library(crt ${CRT_SOURCE} ${crt_asm}) add_library(crt ${CRT_SOURCE} ${crt_asm})
target_link_libraries(crt chkstk ${PSEH_LIB}) target_link_libraries(crt chkstk ${PSEH_LIB})
target_sources(crt PRIVATE $<TARGET_OBJECTS:crtmath>)
target_compile_definitions(crt target_compile_definitions(crt
PRIVATE __MINGW_IMPORT=extern PRIVATE __MINGW_IMPORT=extern
USE_MSVCRT_PREFIX USE_MSVCRT_PREFIX

19
sdk/lib/crt/crtmath.cmake Normal file
View file

@ -0,0 +1,19 @@
list(APPEND CRTMATH_SOURCE
${CRT_FLOAT_SOURCE}
${CRT_MATH_SOURCE}
)
list(APPEND CRTMATH_ASM_SOURCE
${CRT_FLOAT_ASM_SOURCE}
${CRT_MATH_ASM_SOURCE}
)
add_asm_files(crtmath_asm ${CRTMATH_ASM_SOURCE})
add_library(crtmath ${CRTMATH_SOURCE} ${crtmath_asm})
target_compile_definitions(crtmath PRIVATE
USE_MSVCRT_PREFIX
__fma3_lib_init=__acrt_initialize_fma3
)
add_dependencies(crtmath psdk asm)

4
sdk/lib/crt/ucrtsupport.cmake
View file

@ -1,7 +1,5 @@
list(APPEND UCRTSUPP_SOURCE list(APPEND UCRTSUPP_SOURCE
${CRT_FLOAT_SOURCE}
${CRT_MATH_SOURCE}
misc/amsg.c misc/amsg.c
misc/purecall.c misc/purecall.c
misc/tls.c misc/tls.c
@ -11,8 +9,6 @@ list(APPEND UCRTSUPP_SOURCE
) )
list(APPEND UCRTSUPP_ASM_SOURCE list(APPEND UCRTSUPP_ASM_SOURCE
${CRT_FLOAT_ASM_SOURCE}
${CRT_MATH_ASM_SOURCE}
${CRT_SETJMP_ASM_SOURCE} ${CRT_SETJMP_ASM_SOURCE}
${CRT_WINE_ASM_SOURCE} ${CRT_WINE_ASM_SOURCE}
) )