[ros-diffs] [akhaldi] 48591: [CMAKE] - Cache the mingw32 prefix. - Improve the RC compiler invocation.

Author: akhaldi
Date: Sun Aug 22 13:38:36 2010
New Revision: 48591

URL: http://svn.reactos.org/svn/reactos?rev=48591&view=rev
Log:
[CMAKE]
- Cache the mingw32 prefix.
- Improve the RC compiler invocation.

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] Sun Aug 22 13:38:36 2010
@@ -3,9 +3,9 @@
 
 # Choose the right MinGW prefix
 if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-set(MINGW_PREFIX "")
+set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix")
 else()
-set(MINGW_PREFIX "mingw32-")
+set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix")
 endif()
 
 # the name of the target operating system
@@ -19,7 +19,7 @@
 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_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE>
<CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk
-I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/
-I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos
-I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ")
+SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE>
<CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk
-I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/
-I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos
-I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt/mingw32
-O coff -o <OBJECT> ")
 
 # Use stdcall fixups, and don't link with anything by default unless we say so
 set(CMAKE_C_STANDARD_LIBRARIES -lgcc CACHE STRING "libgcc") # We should add the
environment libgcc here