Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 10:20:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
- Remove some hacks from ntdll and msvcrt build files
- Bring msvcrt* files in better sync

svn path=/trunk/; revision=53483
This commit is contained in:
Thomas Faber 2011-08-28 18:28:18 +00:00
parent d7548bc164
commit 11935531f9
4 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reactos/dll/ntdll/CMakeLists.txt
View file

@ -15,23 +15,23 @@ list(APPEND SOURCE
csr/capture.c
csr/connect.c
dbg/dbgui.c
ldr/ldrapi.c
ldr/ldrinit.c
ldr/ldrpe.c
ldr/ldrutils.c
ldr/ldrapi.c
ldr/ldrinit.c
ldr/ldrpe.c
ldr/ldrutils.c
rtl/libsupp.c
rtl/version.c
def/ntdll.rc
${CMAKE_CURRENT_BINARY_DIR}/ntdll.def)
if(ARCH MATCHES i386)
list(APPEND SOURCE dispatch/i386/dispatch.S)
list(APPEND SOURCE dispatch/i386/dispatch.S)
elseif(ARCH MATCHES amd64)
list(APPEND SOURCE dispatch/amd64/stubs.c)
list(APPEND SOURCE dispatch/amd64/stubs.c)
elseif(ARCH MATCHES arm)
list(APPEND SOURCE dispatch/arm/stubs_asm.s)
list(APPEND SOURCE dispatch/arm/stubs_asm.s)
else()
list(APPEND SOURCE dispatch/dispatch.c)
list(APPEND SOURCE dispatch/dispatch.c)
endif(ARCH MATCHES i386)
add_library(ntdll SHARED ${SOURCE})
@ -39,13 +39,11 @@ add_library(ntdll SHARED ${SOURCE})
set_entrypoint(ntdll 0)
if(MSVC)
target_link_libraries(ntdll rtl)
add_linkerflag(ntdll /RELEASE)
else()
target_link_libraries(ntdll -Wl,--whole-archive rtl -Wl,--no-whole-archive)
add_linkerflag(ntdll /RELEASE)
endif()
target_link_libraries(ntdll
rtl
ntdllsys
libcntpr
${PSEH_LIB})

9
reactos/dll/win32/msvcrt/CMakeLists.txt
View file

@ -23,20 +23,15 @@ list(APPEND SOURCE
add_library(msvcrt SHARED ${SOURCE})
if(NOT MSVC)
set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-u __seh_longjmp_unwind@4")
endif()
add_dependencies(msvcrt psdk)
set_entrypoint(msvcrt DllMain 12)
set_image_base(msvcrt ${baseaddress_msvcrt})
target_link_libraries(msvcrt crt wine)
target_link_libraries(msvcrt crt wine ${PSEH_LIB})
if(MSVC)
# export of deleting destructor "name"
add_linkerflag(msvcrt "/ignore:4102")
else()
target_link_libraries(msvcrt pseh)
endif()
add_importlibs(msvcrt kernel32 ntdll)

13
reactos/dll/win32/msvcrt20/CMakeLists.txt
View file

@ -1,4 +1,6 @@
spec2def(msvcrt20.dll msvcrt20.spec)
add_definitions(
-DUSE_MSVCRT_PREFIX
-D_MSVCRT_
@ -11,8 +13,6 @@ add_definitions(
include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include)
spec2def(msvcrt20.dll msvcrt20.spec)
list(APPEND SOURCE
msvcrt20.c
stubs.c
@ -20,17 +20,18 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def)
add_library(msvcrt20 SHARED ${SOURCE})
add_dependencies(msvcrt20 psdk)
set_entrypoint(msvcrt20 DllMain 12)
set_image_base(msvcrt20 ${baseaddress_msvcrt20})
target_link_libraries(msvcrt20 crt wine)
target_link_libraries(msvcrt20 crt wine ${PSEH_LIB})
if(MSVC)
# export of deleting destructor "name"
add_linkerflag(msvcrt20 "/ignore:4102")
else()
target_link_libraries(msvcrt20 pseh)
endif()
add_importlibs(msvcrt20 kernel32 ntdll)
add_dependencies(msvcrt20 psdk)
add_cd_file(TARGET msvcrt20 DESTINATION reactos/system32 FOR all)

15
reactos/dll/win32/msvcrt40/CMakeLists.txt
View file

@ -1,4 +1,6 @@
spec2def(msvcrt40.dll msvcrt40.spec)
add_definitions(
-DUSE_MSVCRT_PREFIX
-D_MSVCRT_
@ -11,8 +13,6 @@ add_definitions(
include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include)
spec2def(msvcrt40.dll msvcrt40.spec)
list(APPEND SOURCE
msvcrt40.c
stubs.c
@ -20,15 +20,16 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def)
add_library(msvcrt40 SHARED ${SOURCE})
set_image_base(msvcrt40 ${baseaddress_msvcrt40})
set_entrypoint(msvcrt40 DllMain 12)
target_link_libraries(msvcrt40 crt wine)
add_dependencies(msvcrt40 psdk)
set_entrypoint(msvcrt40 DllMain 12)
set_image_base(msvcrt40 ${baseaddress_msvcrt40})
target_link_libraries(msvcrt40 crt wine ${PSEH_LIB})
if(MSVC)
# export of deleting destructor "name"
add_linkerflag(msvcrt40 "/ignore:4102")
else()
target_link_libraries(msvcrt40 pseh)
endif()
add_importlibs(msvcrt40 kernel32 ntdll)