From: Hermès Bélusca-Maïto Date: Wed, 28 Sep 2016 20:21:31 +0000 (+0000) Subject: Use set_module_type() with module type == "module" instead of specifying that the... X-Git-Tag: ReactOS-0.4.3~214 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=9c77bd1cb78c9f0c64afb0d9f9db986254878219;ds=sidebyside Use set_module_type() with module type == "module" instead of specifying that the entrypoint is 0, for resource-only dlls. svn path=/trunk/; revision=72841 --- diff --git a/reactos/dll/win32/iologmsg/CMakeLists.txt b/reactos/dll/win32/iologmsg/CMakeLists.txt index 13e194faecc..473eebe5f1e 100644 --- a/reactos/dll/win32/iologmsg/CMakeLists.txt +++ b/reactos/dll/win32/iologmsg/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos) add_library(iologmsg SHARED iologmsg.rc) -set_module_type(iologmsg win32dll ENTRYPOINT 0 UNICODE) +set_module_type(iologmsg module UNICODE) add_dependencies(iologmsg ntiologc) add_cd_file(TARGET iologmsg DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/netevent/CMakeLists.txt b/reactos/dll/win32/netevent/CMakeLists.txt index 6207506ef70..e982d6e8a5d 100644 --- a/reactos/dll/win32/netevent/CMakeLists.txt +++ b/reactos/dll/win32/netevent/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos) add_library(netevent SHARED netevt.rc) -set_module_type(netevent win32dll UNICODE ENTRYPOINT 0) +set_module_type(netevent module UNICODE) add_dependencies(netevent neteventmsg) add_cd_file(TARGET netevent DESTINATION reactos/system32 FOR all) diff --git a/reactos/drivers/base/kdgdb/CMakeLists.txt b/reactos/drivers/base/kdgdb/CMakeLists.txt index 2aaf82c1d37..494429238a2 100644 --- a/reactos/drivers/base/kdgdb/CMakeLists.txt +++ b/reactos/drivers/base/kdgdb/CMakeLists.txt @@ -20,9 +20,8 @@ add_library(kdcom SHARED kdgdb.rc ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) -set_entrypoint(kdcom 0) +set_module_type(kdcom module IMAGEBASE 0x00010000) set_subsystem(kdcom native) -set_image_base(kdcom 0x00010000) add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) add_pch(kdcom kdgdb.h SOURCE) diff --git a/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt b/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt index fe763b6680b..c3d8976521c 100644 --- a/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt +++ b/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt @@ -2,5 +2,5 @@ file(GLOB pifmgr_rc_deps "res/*.*" "res_alt/*.*") add_rc_deps(pifmgr.rc ${pifmgr_rc_deps}) add_library(pifmgr SHARED pifmgr.rc) -set_module_type(pifmgr win32dll UNICODE ENTRYPOINT 0) +set_module_type(pifmgr module UNICODE) add_cd_file(TARGET pifmgr DESTINATION reactos/system32 FOR all)