Author: spetreolle Date: Sun Sep 19 16:16:01 2010 New Revision: 48814
URL: http://svn.reactos.org/svn/reactos?rev=48814&view=rev Log: [CMAKE] Fix minicd boot regression. Remove unneeded usetup link to msvcrt.
Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake
Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup/... ============================================================================== --- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sun Sep 19 16:16:01 2010 @@ -35,8 +35,7 @@ newinflib ext2lib vfatlib - mingw_common - -lmsvcrt) + mingw_common)
set_target_properties(usetup PROPERTIES LINK_FLAGS "-Wl,-entry,_NtProcessStartup@4")
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 Sep 19 16:16:01 2010 @@ -31,8 +31,11 @@
# 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 -#-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds +if(ARCH MATCHES i386) +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") +elseif(ARCH MATCHES amd64) set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at") +endif(ARCH MATCHES i386)
# adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search