From 287ba86f03fe880ecf03ac53a842cfbcc9174c68 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 8 Jan 2011 11:52:58 +0000 Subject: [PATCH] [CMAKE] - Add -fshort-wchar to host tools svn path=/branches/cmake-bringup/; revision=50320 --- CMakeLists.txt | 6 ++++-- gcc.cmake | 6 +----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f46358f0cc0..ff11971a3ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,8 @@ endif() if(NOT CMAKE_CROSSCOMPILING) + add_definitions(-fshort-wchar) + add_definitions(-DTARGET_${ARCH}) if(ARCH MATCHES i386) @@ -51,14 +53,14 @@ else() set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables") include(${IMPORT_EXECUTABLES}) -endif(NOT CMAKE_CROSSCOMPILING) +endif() # Compiler specific definitions and macros if(MSVC) include(msc.cmake) else() include(gcc.cmake) -endif(MSVC) +endif() # Generic macros include(CMakeMacros.cmake) diff --git a/gcc.cmake b/gcc.cmake index 563ef56a060..06c6c063a22 100644 --- a/gcc.cmake +++ b/gcc.cmake @@ -1,9 +1,5 @@ -if(NOT CMAKE_CROSSCOMPILING) - -add_definitions(-fshort-wchar) - -else() +if(CMAKE_CROSSCOMPILING) # Linking link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)