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

[CMAKE] Fix host tools build on x86-64 mingw

Browse source 
Dynamically check for sys/types.h and pid_t in wine config.h
Use TARGET_xxx defines instead of _X86_ as this is undefined by GCC
Add some sense in include directories management by using interface
libraries
This commit is contained in:
Jérôme Gardou 2019-11-15 14:07:46 +01:00 • committed by Jérôme Gardou
parent 15748cf03a
commit 493ceb7ade
19 changed files with 64 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,5 @@
add_definitions(-DNO_VIZ)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib)
list(APPEND SOLO_SOURCE
adler32.c
@ -35,11 +34,15 @@ list(APPEND MINIZIP_SOURCE
if(CMAKE_CROSSCOMPILING)
add_library(zlib ${SOURCE} ${SOLO_SOURCE})
target_include_directories(zlib PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib)
add_library(zlib_solo ${SOLO_SOURCE})
add_target_compile_definitions(zlib_solo Z_SOLO)
target_include_directories(zlib_solo PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib)
add_library(minizip ${MINIZIP_SOURCE})
add_dependencies(minizip psdk)
target_include_directories(minizip PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib)
else()
add_library(zlibhost ${SOLO_SOURCE})
add_target_compile_definitions(zlibhost Z_SOLO)
target_include_directories(zlibhost PUBLIC ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib)
endif()