set(${var} 16)
elseif(${dir} STREQUAL reactos/system32/wbem)
set(${var} 17)
+ elseif(${dir} STREQUAL reactos/Resources/Themes/Lautus)
+ set(${var} 18)
else()
message(FATAL_ERROR "Wrong destination: ${dir}")
endif()
endforeach()
if(_CD_TARGET)
#manage dependency
- add_dependencies(bootcd ${_CD_TARGET})
+ add_dependencies(bootcd ${_CD_TARGET} converted_hives)
endif()
else()
#add it in reactos.cab
if(NOT __cd EQUAL -1)
#manage dependency
if(_CD_TARGET)
- add_dependencies(livecd ${_CD_TARGET})
+ add_dependencies(livecd ${_CD_TARGET} converted_hives)
endif()
foreach(item ${_CD_FILE})
if(_CD_NAME_ON_CD)
endforeach()
if(_CD_TARGET)
#manage dependency
- add_dependencies(bootcdregtest ${_CD_TARGET})
+ add_dependencies(bootcdregtest ${_CD_TARGET} converted_hives)
endif()
else()
#add it in reactos.cab
endfunction()
function(set_module_type MODULE TYPE)
- cmake_parse_arguments(__module "UNICODE" "IMAGEBASE" "ENTRYPOINT" ${ARGN})
+ cmake_parse_arguments(__module "UNICODE;HOTPATCHABLE" "IMAGEBASE" "ENTRYPOINT" ${ARGN})
if(__module_UNPARSED_ARGUMENTS)
message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}")
set(__subsystem console)
elseif(${TYPE} STREQUAL win32gui)
set(__subsystem windows)
+ elseif(${TYPE} STREQUAL kbdlayout)
+ set_entrypoint(${MODULE} 0)
+ set_image_base(${MODULE} 0x5FFF0000)
+ set_subsystem(${MODULE} native)
+ if (MSVC)
+ # Merge the .text and .rdata section into the .data section
+ add_target_link_flags(${MODULE} "/ignore:4254 /SECTION:.data,ER /MERGE:.text=.data /MERGE:.rdata=.data /MERGE:.bss=.data /MERGE:.edata=.data")
+ else()
+ # Use a custom linker script
+ add_target_link_flags(${MODULE} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds")
+ add_dependencies(${MODULE} "${CMAKE_SOURCE_DIR}/kbdlayout.lds")
+ endif()
elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx)
OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module)))
message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}")
add_target_compile_definitions(${MODULE} UNICODE _UNICODE)
endif()
+ # Handle hotpatchable images.
+ # GCC has this as a function attribute so we're handling it using DECLSPEC_HOTPATCH
+ if(__module_HOTPATCHABLE AND MSVC AND (NOT ARCH STREQUAL "arm"))
+ set_property(TARGET ${MODULE} APPEND_STRING PROPERTY COMPILE_FLAGS " /hotpatch")
+ if(ARCH STREQUAL "i386")
+ set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:5")
+ elseif(ARCH STREQUAL "amd64")
+ set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:6")
+ endif()
+ endif()
+
# set entry point
if(__module_ENTRYPOINT OR (__module_ENTRYPOINT STREQUAL "0"))
list(GET __module_ENTRYPOINT 0 __entrypoint)