Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-01 23:42:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Add ARM architecture support
- disable makefile debugging

svn path=/trunk/; revision=56962
This commit is contained in:
Timo Kreuzer 2012-07-24 18:54:31 +00:00
parent f3417b4646
commit 80a9f50fbf
2 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
reactos/cmake/Platform/Windows-cl.cmake
View file

@ -62,6 +62,28 @@ if(CMAKE_USE_WDK_ENV)
endif() endif()
endif() endif()
############
# Set lib path for ARM compiler
if(${ARCH} MATCHES arm)
message("Using ARM build for cross compilation. Host tools are x86.")
# Force C/C++ Compilers
include(CMakeForceCompiler)
CMAKE_FORCE_C_COMPILER(cl MSVC)
CMAKE_FORCE_CXX_COMPILER(cl MSVC)
if(NOT CMAKE_CROSSCOMPILING)
message("Using x86 target for ARM host tools.")
set(ARCH i386)
LINK_DIRECTORIES($ENV{WindowsSdkDir}\\Lib\\win8\\um\\x86)
endif()
#LINK_DIRECTORIES($ENV{LIB})
endif()
############ ############
SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows) SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows)
@ -234,6 +256,10 @@ SET(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID})
IF(NOT _MACHINE_ARCH_FLAG) IF(NOT _MACHINE_ARCH_FLAG)
SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID})
ENDIF(NOT _MACHINE_ARCH_FLAG) ENDIF(NOT _MACHINE_ARCH_FLAG)
# HACK
if(${ARCH} MATCHES arm)
SET(_MACHINE_ARCH_FLAG ARM)
endif()
SET (CMAKE_EXE_LINKER_FLAGS_INIT SET (CMAKE_EXE_LINKER_FLAGS_INIT
"${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}") "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}")

4
reactos/cmake/Platform/Windows.cmake
View file

@ -30,7 +30,7 @@ ENDIF(CMAKE_GENERATOR MATCHES "NMake")
INCLUDE(Platform/WindowsPaths) INCLUDE(Platform/WindowsPaths)
# uncomment these out to debug nmake and borland makefiles # uncomment these out to debug nmake and borland makefiles
SET(CMAKE_START_TEMP_FILE "") #SET(CMAKE_START_TEMP_FILE "")
SET(CMAKE_END_TEMP_FILE "") #SET(CMAKE_END_TEMP_FILE "")
#SET(CMAKE_VERBOSE_MAKEFILE 1) #SET(CMAKE_VERBOSE_MAKEFILE 1)