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

[REACTOS] Improve handling of non-standard names

Browse source 
- Link oldnames instead of defining names
- Define _CRT_DECLARE_NONSTDC_NAMES to 1 where needed
- Remove header hacks
This commit is contained in:
Timo Kreuzer 2024-05-22 20:48:04 +03:00
parent b707be90a1
commit bf95874c2d
16 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sdk/lib/3rdparty/stlport/CMakeLists.txt vendored
View file

@ -51,6 +51,11 @@ target_compile_definitions(stlport PRIVATE
_STLP_USE_EXCEPTIONS _DLL __USE_CRTIMP
_BUILD_STLPORT NATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/sdk/include/c++)
target_compile_definitions(stlport PUBLIC
_CRT_DECLARE_NONSTDC_NAMES=1
_CRT_NONSTDC_NO_DEPRECATE
)
target_include_directories(stlport INTERFACE "$<$<COMPILE_LANGUAGE:CXX>:${REACTOS_SOURCE_DIR}/sdk/include/c++/stlport>")
target_compile_definitions(stlport INTERFACE "$<$<COMPILE_LANGUAGE:CXX>:NATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/sdk/include/c++>")
set_target_cpp_properties(stlport WITH_EXCEPTIONS WITH_RTTI)

1
sdk/lib/3rdparty/zlib/CMakeLists.txt vendored
View file

@ -34,6 +34,7 @@ list(APPEND MINIZIP_SOURCE
if(CMAKE_CROSSCOMPILING)
add_library(zlib ${SOURCE} ${SOLO_SOURCE})
target_link_libraries(zlib oldnames)
target_include_directories(zlib PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib)
add_library(zlib_solo ${SOLO_SOURCE})
target_compile_definitions(zlib_solo PRIVATE Z_SOLO)