Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:05:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
Fix minicd boot regression.
Remove unneeded usetup link to msvcrt.

svn path=/branches/cmake-bringup/; revision=48814
This commit is contained in:
Sylvain Petreolle 2010-09-19 16:16:01 +00:00
parent f24f83f0b3
commit 886d934055
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
base/setup/usetup/CMakeLists.txt
View file

@ -35,8 +35,7 @@ target_link_libraries(usetup
newinflib newinflib
ext2lib ext2lib
vfatlib vfatlib
mingw_common mingw_common)
-lmsvcrt)
set_target_properties(usetup PROPERTIES LINK_FLAGS "-Wl,-entry,_NtProcessStartup@4") set_target_properties(usetup PROPERTIES LINK_FLAGS "-Wl,-entry,_NtProcessStartup@4")

5
toolchain-mingw32.cmake
View file

@ -31,8 +31,11 @@ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS
# Use stdcall fixups, and don't link with anything by default unless we say so # 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 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") 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: # adjust the default behaviour of the FIND_XXX() commands:
# search headers and libraries in the target environment, search # search headers and libraries in the target environment, search