From: Sir Richard <sir_richard@svn.reactos.org>
Date: Tue, 3 Aug 2010 14:53:12 +0000 (+0000)
Subject: [CMAKE]: Make simple rule for building ASM files.
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~943
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=5abcbffcd0ea83556bdf81d7bbc365caf402f0a3

[CMAKE]: Make simple rule for building ASM files.
[CMAKE]: Enable RC support.
[CMAKE]: Stop building tools we won't need.

svn path=/branches/cmake-bringup/; revision=48427
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4464234276c..2ed4db3cb44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,13 +16,16 @@ include_directories(./include/reactos/wine)
 add_subdirectory(tools)
 add_subdirectory(lib)
 
-export(TARGETS widl winebuild wmc wrc nci pefixup rsym FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+export(TARGETS widl winebuild nci FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
 
 else()
 
-# Activate support for asm source files
+# Activate support for assembly source files
 enable_language(ASM)
 
+# Activate language support for resource files
+enable_language(RC)
+
 set(IMPORT_EXECUTABLES "${REACTOS_SOURCE_DIR}/build/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
 include(${IMPORT_EXECUTABLES})
 
@@ -40,7 +43,10 @@ add_definitions(-DUSE_COMPILER_EXCEPTIONS)
 add_definitions(-D_USE_32BIT_TIME_T)
 
 # Compiler Core
-add_definitions(-gstabs+ -pipe -fms-extensions -fno-set-stack-executable)
+add_definitions(-pipe -fms-extensions -fno-set-stack-executable)
+
+# Debugging (Note: DWARF-4 on 4.5.1 when we ship)
+add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types)
 
 # Tuning
 add_definitions(-march=pentium -mtune=i686)
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index 7deaee26fde..c50029b25c4 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -15,8 +15,9 @@ SET(CMAKE_SYSTEM_PROCESSOR i686)
 # which compilers to use for C and C++
 SET(CMAKE_C_COMPILER ${MINGW_PREFIX}gcc)
 SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}g++)
-
+SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres)
 SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc)
+set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
 
 # adjust the default behaviour of the FIND_XXX() commands:
 # search headers and libraries in the target environment, search