Author: sir_richard
Date: Wed Aug 4 07:51:26 2010
New Revision: 48448
URL:
http://svn.reactos.org/svn/reactos?rev=48448&view=rev
Log:
[CMAKE]: Add full support for linking RC files with windres.
Modified:
branches/cmake-bringup/toolchain-mingw32.cmake
Modified: branches/cmake-bringup/toolchain-mingw32.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32…
==============================================================================
--- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Wed Aug 4 07:51:26 2010
@@ -17,9 +17,8 @@
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>")
-
-set(CMAKE_STANDARD_LIBRARIES "")
+SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o
<OBJECT> <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
+SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff
-I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_BINARY_DIR}/include/reactos -i <SOURCE>
-o <OBJECT> <DEFINES> -DRC_INVOKED")
# adjust the default behaviour of the FIND_XXX() commands:
# search headers and libraries in the target environment, search