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

sir_richard at svn.reactos.org sir_richard at svn.reactos.org
Tue Aug 3 14:53:13 UTC 2010


Author: sir_richard
Date: Tue Aug  3 14:53:12 2010
New Revision: 48427

URL: http://svn.reactos.org/svn/reactos?rev=48427&view=rev
Log:
[CMAKE]: Make simple rule for building ASM files.
[CMAKE]: Enable RC support.
[CMAKE]: Stop building tools we won't need.

Modified:
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/toolchain-mingw32.cmake
    branches/cmake-bringup/tools/CMakeLists.txt

Modified: branches/cmake-bringup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev=48427&r1=48426&r2=48427&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Tue Aug  3 14:53:12 2010
@@ -16,12 +16,15 @@
 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(-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)

Modified: branches/cmake-bringup/toolchain-mingw32.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32.cmake?rev=48427&r1=48426&r2=48427&view=diff
==============================================================================
--- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Tue Aug  3 14:53:12 2010
@@ -15,8 +15,9 @@
 # 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 

Modified: branches/cmake-bringup/tools/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.txt?rev=48427&r1=48426&r2=48427&view=diff
==============================================================================
--- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Tue Aug  3 14:53:12 2010
@@ -1,22 +1,15 @@
-if(NOT CMAKE_CROSSCOMPILING)
-
 add_library(xml xml.cpp ssprintf.cpp)
 
 add_executable(bin2c bin2c.c)
-add_executable(pefixup pefixup.c)
+#add_executable(pefixup pefixup.c)
 
 add_subdirectory(buildno)
 add_subdirectory(gendib)
-add_subdirectory(rsym)
+#add_subdirectory(rsym)
 add_subdirectory(nci)
 add_subdirectory(winebuild)
 add_subdirectory(unicode)
 add_subdirectory(wpp)
-add_subdirectory(wmc)
+#add_subdirectory(wmc)
 add_subdirectory(widl)
-add_subdirectory(wrc)
-
-else()
-
-
-endif()
+#add_subdirectory(wry)




More information about the Ros-diffs mailing list