mirror of
https://github.com/reactos/reactos.git
synced 2024-07-01 18:24:24 +00:00
[CMAKE]
* Add a way to use WDK headers (psdk, crt and ddk) instead of ours. To use it, just alter USE_WDK_HEADERS in configure.cmd to be 1 instead of 0. svn path=/trunk/; revision=52439
This commit is contained in:
parent
0710002caa
commit
9622e8516f
|
@ -152,19 +152,36 @@ else()
|
||||||
# Activate language support for resource files
|
# Activate language support for resource files
|
||||||
enable_language(RC)
|
enable_language(RC)
|
||||||
|
|
||||||
include_directories(
|
if(MSVC AND USE_WDK_HEADERS)
|
||||||
include
|
include_directories(
|
||||||
include/psdk
|
include
|
||||||
include/dxsdk
|
$ENV{SDK_INC_PATH}
|
||||||
${REACTOS_BINARY_DIR}/include
|
include/dxsdk
|
||||||
${REACTOS_BINARY_DIR}/include/dxsdk
|
${REACTOS_BINARY_DIR}/include
|
||||||
${REACTOS_BINARY_DIR}/include/psdk
|
${REACTOS_BINARY_DIR}/include/dxsdk
|
||||||
${REACTOS_BINARY_DIR}/include/reactos
|
${REACTOS_BINARY_DIR}/include/psdk
|
||||||
include/crt
|
${REACTOS_BINARY_DIR}/include/reactos
|
||||||
include/ddk
|
$ENV{CRT_INC_PATH}
|
||||||
include/ndk
|
$ENV{DDK_INC_PATH}
|
||||||
include/reactos
|
include/ndk
|
||||||
include/reactos/libs)
|
include/reactos
|
||||||
|
include/reactos/libs)
|
||||||
|
else()
|
||||||
|
include_directories(
|
||||||
|
include
|
||||||
|
include/psdk
|
||||||
|
include/dxsdk
|
||||||
|
${REACTOS_BINARY_DIR}/include
|
||||||
|
${REACTOS_BINARY_DIR}/include/dxsdk
|
||||||
|
${REACTOS_BINARY_DIR}/include/psdk
|
||||||
|
${REACTOS_BINARY_DIR}/include/reactos
|
||||||
|
include/crt
|
||||||
|
include/ddk
|
||||||
|
include/ndk
|
||||||
|
include/reactos
|
||||||
|
include/reactos/libs)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if(ARCH MATCHES arm)
|
if(ARCH MATCHES arm)
|
||||||
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm)
|
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm)
|
||||||
|
|
|
@ -18,6 +18,7 @@ if defined ROS_ARCH (
|
||||||
)
|
)
|
||||||
set BUILD_ENVIRONMENT=WDK
|
set BUILD_ENVIRONMENT=WDK
|
||||||
set USE_NMAKE=1
|
set USE_NMAKE=1
|
||||||
|
set USE_WDK_HEADERS=0
|
||||||
echo Detected DDK/WDK for %DDK_TARGET_OS%-%ARCH%
|
echo Detected DDK/WDK for %DDK_TARGET_OS%-%ARCH%
|
||||||
)else if defined VCINSTALLDIR (
|
)else if defined VCINSTALLDIR (
|
||||||
:: VS command prompt does not put this in enviroment vars
|
:: VS command prompt does not put this in enviroment vars
|
||||||
|
@ -118,7 +119,7 @@ if EXIST CMakeCache.txt (
|
||||||
if "%BUILD_ENVIRONMENT%" == "MinGW" (
|
if "%BUILD_ENVIRONMENT%" == "MinGW" (
|
||||||
cmake -G "MinGW Makefiles" -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
|
cmake -G "MinGW Makefiles" -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
|
||||||
) else if defined USE_NMAKE (
|
) else if defined USE_NMAKE (
|
||||||
cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
|
cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
|
||||||
) else if "%BUILD_ENVIRONMENT%" == "VS8" (
|
) else if "%BUILD_ENVIRONMENT%" == "VS8" (
|
||||||
if "%ARCH%" == "amd64" (
|
if "%ARCH%" == "amd64" (
|
||||||
cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
|
cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
|
||||||
|
|
Loading…
Reference in a new issue