Author: tkreuzer Date: Tue Aug 23 08:13:33 2011 New Revision: 53396
URL: http://svn.reactos.org/svn/reactos?rev=53396&view=rev Log: [CMAKE] - fix usage of set_entrypoint - link libpng to ntdll on amd64 - build crtdll and nmidebug only on x86 - silence some linker warnings on MSVC - compile riched20/msvc-thiscall.c only on x86 - Add WIN64 definition to acpica - Add ehandler.c to libcntpr
Modified: trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/crtdll/CMakeLists.txt trunk/reactos/dll/win32/fmifs/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/msacm32/CMakeLists.txt trunk/reactos/dll/win32/msvcrt/CMakeLists.txt trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt trunk/reactos/dll/win32/riched20/CMakeLists.txt trunk/reactos/drivers/base/CMakeLists.txt trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/video/displays/framebuf/CMakeLists.txt trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt trunk/reactos/drivers/video/displays/vga/CMakeLists.txt trunk/reactos/drivers/video/font/bmfd/CMakeLists.txt trunk/reactos/drivers/video/font/ftfd/CMakeLists.txt trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/ntoskrnl/CMakeLists.txt
Modified: trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/CMakeLi... ============================================================================== --- trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -30,5 +30,8 @@ set_entrypoint(libpng 0) target_link_libraries(libpng zlib) add_importlibs(libpng msvcrt kernel32) +if(ARCH MATCHES amd64) + add_importlibs(libpng ntdll) +endif() add_dependencies(libpng psdk) add_cd_file(TARGET libpng DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?re... ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -22,7 +22,9 @@ add_subdirectory(comdlg32) add_subdirectory(compstui) add_subdirectory(credui) -add_subdirectory(crtdll) +if(ARCH MATCHES i386) + add_subdirectory(crtdll) # only built on x86 +endif() add_subdirectory(crypt32) add_subdirectory(cryptdlg) add_subdirectory(cryptdll) @@ -210,7 +212,9 @@ add_subdirectory(uxtheme) add_subdirectory(vdmdbg) add_subdirectory(version) -add_subdirectory(wdmaud.drv) +if(ARCH MATCHES i386) + add_subdirectory(wdmaud.drv) +endif() add_subdirectory(windowscodecs) add_subdirectory(winemp3.acm) add_subdirectory(winfax)
Modified: trunk/reactos/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/CMakeLists... ============================================================================== --- trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -21,7 +21,7 @@
set_module_type(crtdll win32dll)
-set_entrypoint(crtdll DllMain@12) +set_entrypoint(crtdll DllMain 12)
target_link_libraries(crtdll wine crt)
Modified: trunk/reactos/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/CMakeLists.... ============================================================================== --- trunk/reactos/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -15,7 +15,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def)
add_library(fmifs SHARED ${SOURCE}) -set_entrypoint(fmifs InitializeFmIfs@12) +set_entrypoint(fmifs InitializeFmIfs 12) add_importlibs(fmifs kernel32 ntdll) add_pch(fmifs precomp.h) add_dependencies(fmifs psdk)
Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -93,7 +93,7 @@
add_library(kernel32 SHARED ${SOURCE})
-set_entrypoint(kernel32 DllMain@12) +set_entrypoint(kernel32 DllMain 12) set_image_base(kernel32 ${baseaddress_kernel32})
target_link_libraries(kernel32 wine chkstk ${PSEH_LIB})
Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/CMakeList... ============================================================================== --- trunk/reactos/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -20,7 +20,7 @@
add_library(msacm32 SHARED ${SOURCE})
-set_entrypoint(msacm32 DllMain@12) +set_entrypoint(msacm32 DllMain 12) set_image_base(msacm32 ${baseaddress_msacm32})
target_link_libraries(msacm32 wine)
Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeLists... ============================================================================== --- trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -33,7 +33,9 @@
target_link_libraries(msvcrt crt wine)
-if(NOT MSVC) +if(MSVC) + add_linkerflag(msvcrt "/ignore:4102") +else() target_link_libraries(msvcrt pseh) endif()
Modified: trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -20,13 +20,15 @@ ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def)
add_library(msvcrt20 SHARED ${SOURCE}) -set_entrypoint(msvcrt20 DllMain@12) +set_entrypoint(msvcrt20 DllMain 12) set_image_base(msvcrt20 ${baseaddress_msvcrt20})
target_link_libraries(msvcrt20 crt wine)
-if(NOT MSVC) - target_link_libraries(msvcrt20 pseh) +if(MSVC) + add_linkerflag(msvcrt20 "/ignore:4102") +else() + target_link_libraries(msvcrt20 pseh) endif()
add_importlibs(msvcrt20 kernel32 ntdll)
Modified: trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -21,11 +21,13 @@
add_library(msvcrt40 SHARED ${SOURCE}) set_image_base(msvcrt40 ${baseaddress_msvcrt40}) -set_entrypoint(msvcrt40 DllMain@12) +set_entrypoint(msvcrt40 DllMain 12)
target_link_libraries(msvcrt40 crt wine)
-if(NOT MSVC) +if(MSVC) + add_linkerflag(msvcrt40 "/ignore:4102") +else() target_link_libraries(msvcrt40 pseh) endif()
Modified: trunk/reactos/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -30,7 +30,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/riched20.def)
if(MSVC) - list(APPEND SOURCE msvc-thiscall.c) + if (ARCH MATCHES i386) + list(APPEND SOURCE msvc-thiscall.c) + endif() set_source_files_properties(txthost.c txtsrv.c PROPERTIES COMPILE_FLAGS "/FImsvc.h") endif()
Modified: trunk/reactos/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/CMakeLists.txt... ============================================================================== --- trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -7,6 +7,7 @@ else() add_subdirectory(kdcom) endif() - -add_subdirectory(nmidebug) +if(ARCH MATCHES i386) + add_subdirectory(nmidebug) +endif() add_subdirectory(null)
Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeLists... ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -2,6 +2,10 @@ include_directories( include acpica/include) + +if(ARCH MATCHES amd64) + add_definitions(-DWIN64) +endif()
add_library(acpica acpica/dispatcher/dsfield.c
Modified: trunk/reactos/drivers/video/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram... ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -11,7 +11,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def)
add_pch(framebuf framebuf.h) -set_entrypoint(framebuf DrvEnableDriver@12) +set_entrypoint(framebuf DrvEnableDriver 12) set_subsystem(framebuf native) set_image_base(framebuf 0x00010000) target_link_libraries(framebuf libcntpr)
Modified: trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fram... ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -20,7 +20,7 @@ endif() endif()
-set_entrypoint(framebuf_new DrvEnableDriver@12) +set_entrypoint(framebuf_new DrvEnableDriver 12) set_subsystem(framebuf_new native) set_image_base(framebuf_new 0x00010000)
Modified: trunk/reactos/drivers/video/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga/... ============================================================================== --- trunk/reactos/drivers/video/displays/vga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -15,7 +15,7 @@ vgaddi.rc ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def)
-set_entrypoint(vgaddi DrvEnableDriver@12) +set_entrypoint(vgaddi DrvEnableDriver 12) set_subsystem(vgaddi native) set_image_base(vgaddi 0x00010000) add_pch(vgaddi vgaddi.h)
Modified: trunk/reactos/drivers/video/font/bmfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/bmfd/CMa... ============================================================================== --- trunk/reactos/drivers/video/font/bmfd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/bmfd/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -5,7 +5,7 @@ glyph.c)
add_pch(bmfd bmfd.h) -set_entrypoint(bmfd BmfdEnableDriver@12) +set_entrypoint(bmfd BmfdEnableDriver 12) set_subsystem(bmfd native) set_image_base(bmfd 0x00010000) target_link_libraries(bmfd libcntpr)
Modified: trunk/reactos/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/CMa... ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -11,7 +11,7 @@ sprintf.c ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def)
-set_entrypoint(ftfd FtfdEnableDriver@12) +set_entrypoint(ftfd FtfdEnableDriver 12) set_subsystem(ftfd native) set_image_base(ftfd ${baseaddress_ftfd})
Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?r... ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -96,7 +96,7 @@ add_pch(hal include/hal.h) add_dependencies(hal psdk bugcodes)
- set_entrypoint(hal HalInitSystem@8) + set_entrypoint(hal HalInitSystem 8) set_subsystem(hal native) set_image_base(hal 0x00010000) add_importlibs(hal ntoskrnl)
Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake?... ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -98,6 +98,7 @@ endif() elseif(ARCH MATCHES amd64) list(APPEND LIBCNTPR_SOURCE + except/amd64/ehandler.c except/amd64/chkstk_asm.s except/amd64/seh.s setjmp/amd64/setjmp.s
Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?rev... ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Tue Aug 23 08:13:33 2011 @@ -421,7 +421,7 @@ add_executable(ntoskrnl ${SOURCE})
if (ARCH MATCHES i386) - set_entrypoint(ntoskrnl KiSystemStartup@4) + set_entrypoint(ntoskrnl KiSystemStartup 4) else() set_entrypoint(ntoskrnl KiSystemStartup) endif()