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

[CMAKE]

Browse source 
- Generalize CMAKE_C_LINK_EXECUTABLE and CMAKE_EXE_LINKER_FLAGS, and use additional flags per module.
- Fix usetup: make it depend on psdk and buildno_header, and also fix the entry point (_NtProcessStartup -> _NtProcessStartup@4)
- Make ext2lib depend on psdk.

svn path=/branches/cmake-bringup/; revision=48802
This commit is contained in:
Amine Khaldi 2010-09-18 12:14:03 +00:00
parent 6730fe41ce
commit 13dc8a4761
5 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
base/applications/calc/CMakeLists.txt
View file

@ -1,7 +1,4 @@
set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,-entry,_WinMainCRTStartup -Wl,--enable-stdcall-fixup -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")
add_definitions(-DUNICODE -D_UNICODE)
add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
@ -20,4 +17,6 @@ target_link_libraries(calc mingw_wmain mingw_common
-lgdi32
-lmsvcrt)
set_target_properties(calc PROPERTIES LINK_FLAGS "-Wl,-entry,_WinMainCRTStartup")
add_dependencies(calc psdk)

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

@ -1,7 +1,4 @@
set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,-entry,_NtProcessStartup -Wl,--enable-stdcall-fixup -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")
include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib)
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
@ -40,3 +37,7 @@ target_link_libraries(usetup
vfatlib
mingw_common
-lmsvcrt)
set_target_properties(usetup PROPERTIES LINK_FLAGS "-Wl,-entry,_NtProcessStartup@4")
add_dependencies(usetup psdk buildno_header)