mirror of
https://github.com/reactos/reactos.git
synced 2024-08-20 02:13:29 +00:00
[CMAKE]
- Improve formatting, mainly the uppercase macro names. No functionality change. svn path=/branches/cmake-bringup/; revision=50124
This commit is contained in:
parent
682ad4754b
commit
6d973bdc1c
|
@ -1,8 +1,7 @@
|
||||||
|
|
||||||
|
|
||||||
if (NOT MSVC)
|
if (NOT MSVC)
|
||||||
MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
|
|
||||||
|
|
||||||
|
macro(CreateBootSectorTarget _target_name _asm_file _object_file)
|
||||||
get_filename_component(OBJECT_PATH ${_object_file} PATH)
|
get_filename_component(OBJECT_PATH ${_object_file} PATH)
|
||||||
get_filename_component(OBJECT_NAME ${_object_file} NAME)
|
get_filename_component(OBJECT_NAME ${_object_file} NAME)
|
||||||
file(MAKE_DIRECTORY ${OBJECT_PATH})
|
file(MAKE_DIRECTORY ${OBJECT_PATH})
|
||||||
|
@ -11,11 +10,11 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
|
||||||
|
|
||||||
foreach(arg ${defines})
|
foreach(arg ${defines})
|
||||||
set(result_defs ${result_defs} -D${arg})
|
set(result_defs ${result_defs} -D${arg})
|
||||||
endforeach(arg ${defines})
|
endforeach()
|
||||||
|
|
||||||
foreach(arg ${includes})
|
foreach(arg ${includes})
|
||||||
set(result_incs -I${arg} ${result_incs})
|
set(result_incs -I${arg} ${result_incs})
|
||||||
endforeach(arg ${includes})
|
endforeach()
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${_object_file}
|
OUTPUT ${_object_file}
|
||||||
|
@ -24,88 +23,91 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
|
||||||
set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)
|
set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)
|
||||||
add_custom_target(${_target_name} ALL DEPENDS ${_object_file})
|
add_custom_target(${_target_name} ALL DEPENDS ${_object_file})
|
||||||
add_minicd(${_object_file} loader ${OBJECT_NAME})
|
add_minicd(${_object_file} loader ${OBJECT_NAME})
|
||||||
ENDMACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
|
endmacro()
|
||||||
|
|
||||||
else()
|
else()
|
||||||
MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
|
|
||||||
ENDMACRO()
|
macro(CreateBootSectorTarget _target_name _asm_file _object_file)
|
||||||
|
endmacro()
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
MACRO(MACRO_IDL_COMPILE_OBJECT OBJECT SOURCE)
|
macro(idl_compile_object OBJECT SOURCE)
|
||||||
GET_PROPERTY(FLAGS SOURCE ${SOURCE} PROPERTY COMPILE_FLAGS)
|
get_property(FLAGS SOURCE ${SOURCE} PROPERTY COMPILE_FLAGS)
|
||||||
GET_PROPERTY(DEFINES SOURCE ${SOURCE} PROPERTY COMPILE_DEFINITIONS)
|
get_property(DEFINES SOURCE ${SOURCE} PROPERTY COMPILE_DEFINITIONS)
|
||||||
GET_PROPERTY(INCLUDE_DIRECTORIES DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
|
get_property(INCLUDE_DIRECTORIES DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
|
||||||
FOREACH(DIR ${INCLUDE_DIRECTORIES})
|
|
||||||
SET(FLAGS "${FLAGS} -I${DIR}")
|
foreach(DIR ${INCLUDE_DIRECTORIES})
|
||||||
ENDFOREACH()
|
set(FLAGS "${FLAGS} -I${DIR}")
|
||||||
|
endforeach()
|
||||||
|
|
||||||
SET(IDL_COMMAND ${CMAKE_IDL_COMPILE_OBJECT})
|
set(IDL_COMMAND ${CMAKE_IDL_COMPILE_OBJECT})
|
||||||
STRING(REPLACE "<CMAKE_IDL_COMPILER>" "${CMAKE_IDL_COMPILER}" IDL_COMMAND "${IDL_COMMAND}")
|
string(REPLACE "<CMAKE_IDL_COMPILER>" "${CMAKE_IDL_COMPILER}" IDL_COMMAND "${IDL_COMMAND}")
|
||||||
STRING(REPLACE <FLAGS> "${FLAGS}" IDL_COMMAND "${IDL_COMMAND}")
|
string(REPLACE <FLAGS> "${FLAGS}" IDL_COMMAND "${IDL_COMMAND}")
|
||||||
STRING(REPLACE "<DEFINES>" "${DEFINES}" IDL_COMMAND "${IDL_COMMAND}")
|
string(REPLACE "<DEFINES>" "${DEFINES}" IDL_COMMAND "${IDL_COMMAND}")
|
||||||
STRING(REPLACE "<OBJECT>" "${OBJECT}" IDL_COMMAND "${IDL_COMMAND}")
|
string(REPLACE "<OBJECT>" "${OBJECT}" IDL_COMMAND "${IDL_COMMAND}")
|
||||||
STRING(REPLACE "<SOURCE>" "${SOURCE}" IDL_COMMAND "${IDL_COMMAND}")
|
string(REPLACE "<SOURCE>" "${SOURCE}" IDL_COMMAND "${IDL_COMMAND}")
|
||||||
SEPARATE_ARGUMENTS(IDL_COMMAND)
|
separate_arguments(IDL_COMMAND)
|
||||||
|
|
||||||
ADD_CUSTOM_COMMAND(
|
add_custom_command(
|
||||||
OUTPUT ${OBJECT}
|
OUTPUT ${OBJECT}
|
||||||
COMMAND ${IDL_COMMAND}
|
COMMAND ${IDL_COMMAND}
|
||||||
DEPENDS ${SOURCE}
|
DEPENDS ${SOURCE}
|
||||||
VERBATIM
|
VERBATIM)
|
||||||
)
|
endmacro()
|
||||||
ENDMACRO()
|
|
||||||
|
|
||||||
MACRO(ADD_INTERFACE_DEFINITIONS TARGET)
|
macro(add_interface_definitions TARGET)
|
||||||
FOREACH(SOURCE ${ARGN})
|
foreach(SOURCE ${ARGN})
|
||||||
GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE)
|
get_filename_component(FILE ${SOURCE} NAME_WE)
|
||||||
SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h)
|
set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h)
|
||||||
MACRO_IDL_COMPILE_OBJECT(${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE})
|
idl_compile_object(${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE})
|
||||||
LIST(APPEND OBJECTS ${OBJECT})
|
list(APPEND OBJECTS ${OBJECT})
|
||||||
ENDFOREACH()
|
endforeach()
|
||||||
ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS})
|
add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})
|
||||||
ENDMACRO()
|
endmacro()
|
||||||
|
|
||||||
MACRO(add_minicd_target _targetname _dir) # optional parameter: _nameoncd
|
macro(add_minicd_target _targetname _dir) # optional parameter: _nameoncd
|
||||||
if("${ARGN}" STREQUAL "")
|
if("${ARGN}" STREQUAL "")
|
||||||
get_target_property(FILENAME ${_targetname} LOCATION)
|
get_target_property(FILENAME ${_targetname} LOCATION)
|
||||||
get_filename_component(_nameoncd ${FILENAME} NAME)
|
get_filename_component(_nameoncd ${FILENAME} NAME)
|
||||||
else()
|
else()
|
||||||
set(_nameoncd ${ARGN})
|
set(_nameoncd ${ARGN})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")
|
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")
|
||||||
ENDMACRO(add_minicd_target)
|
|
||||||
|
|
||||||
MACRO(add_minicd FILENAME _dir _nameoncd)
|
|
||||||
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")
|
|
||||||
ENDMACRO(add_minicd)
|
|
||||||
|
|
||||||
macro(set_cpp)
|
|
||||||
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)
|
|
||||||
set(IS_CPP 1)
|
|
||||||
add_definitions(
|
|
||||||
-DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++
|
|
||||||
-DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd
|
macro(add_minicd FILENAME _dir _nameoncd)
|
||||||
|
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro(set_cpp)
|
||||||
|
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)
|
||||||
|
set(IS_CPP 1)
|
||||||
|
add_definitions(
|
||||||
|
-DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++
|
||||||
|
-DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro(add_livecd_target _targetname _dir )# optional parameter : _nameoncd
|
||||||
if("${ARGN}" STREQUAL "")
|
if("${ARGN}" STREQUAL "")
|
||||||
get_target_property(FILENAME ${_targetname} LOCATION)
|
get_target_property(FILENAME ${_targetname} LOCATION)
|
||||||
get_filename_component(_nameoncd ${FILENAME} NAME)
|
get_filename_component(_nameoncd ${FILENAME} NAME)
|
||||||
else()
|
else()
|
||||||
set(_nameoncd ${ARGN})
|
set(_nameoncd ${ARGN})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")
|
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")
|
||||||
ENDMACRO(add_livecd_target)
|
endmacro()
|
||||||
|
|
||||||
MACRO(add_livecd FILENAME _dir)# optional parameter : _nameoncd
|
macro(add_livecd FILENAME _dir)# optional parameter : _nameoncd
|
||||||
if("${ARGN}" STREQUAL "")
|
if("${ARGN}" STREQUAL "")
|
||||||
get_filename_component(_nameoncd ${FILENAME} NAME)
|
get_filename_component(_nameoncd ${FILENAME} NAME)
|
||||||
else()
|
else()
|
||||||
set(_nameoncd ${ARGN})
|
set(_nameoncd ${ARGN})
|
||||||
endif()
|
endif()
|
||||||
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")
|
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")
|
||||||
ENDMACRO(add_livecd)
|
endmacro()
|
||||||
|
|
||||||
macro(cab_to_dir _dir_num _var_name)
|
macro(cab_to_dir _dir_num _var_name)
|
||||||
# 1 = system32
|
# 1 = system32
|
||||||
|
@ -137,17 +139,17 @@ macro(cab_to_dir _dir_num _var_name)
|
||||||
endif()
|
endif()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
MACRO(add_cab_target _targetname _num )
|
macro(add_cab_target _targetname _num )
|
||||||
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt "${_targetname}\t${_num}\n")
|
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt "${_targetname}\t${_num}\n")
|
||||||
cab_to_dir(${_num} _dir)
|
cab_to_dir(${_num} _dir)
|
||||||
add_livecd_target(${_targetname} ${_dir})
|
add_livecd_target(${_targetname} ${_dir})
|
||||||
ENDMACRO(add_cab_target)
|
endmacro()
|
||||||
|
|
||||||
MACRO(add_cab FILENAME _num)
|
macro(add_cab FILENAME _num)
|
||||||
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab.txt "${FILENAME}\t${_num}\n")
|
file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab.txt "${FILENAME}\t${_num}\n")
|
||||||
cab_to_dir(${_num} _dir)
|
cab_to_dir(${_num} _dir)
|
||||||
add_livecd(${FILENAME} ${_dir})
|
add_livecd(${FILENAME} ${_dir})
|
||||||
ENDMACRO(add_cab)
|
endmacro()
|
||||||
|
|
||||||
macro(custom_incdefs)
|
macro(custom_incdefs)
|
||||||
if(NOT DEFINED result_incs) #rpc_defines
|
if(NOT DEFINED result_incs) #rpc_defines
|
||||||
|
@ -156,17 +158,17 @@ macro(custom_incdefs)
|
||||||
|
|
||||||
foreach(arg ${rpc_defines})
|
foreach(arg ${rpc_defines})
|
||||||
set(result_defs ${result_defs} -D${arg})
|
set(result_defs ${result_defs} -D${arg})
|
||||||
endforeach(arg ${defines})
|
endforeach()
|
||||||
|
|
||||||
foreach(arg ${rpc_includes})
|
foreach(arg ${rpc_includes})
|
||||||
set(result_incs -I${arg} ${result_incs})
|
set(result_incs -I${arg} ${result_incs})
|
||||||
endforeach(arg ${includes})
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
endmacro(custom_incdefs)
|
endmacro()
|
||||||
|
|
||||||
macro(rpcproxy TARGET)
|
macro(rpcproxy TARGET)
|
||||||
custom_incdefs()
|
custom_incdefs()
|
||||||
list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c)
|
list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c)
|
||||||
|
|
||||||
foreach(_in_FILE ${ARGN})
|
foreach(_in_FILE ${ARGN})
|
||||||
get_filename_component(FILE ${_in_FILE} NAME_WE)
|
get_filename_component(FILE ${_in_FILE} NAME_WE)
|
||||||
|
@ -183,7 +185,7 @@ macro(rpcproxy TARGET)
|
||||||
add_custom_target(${TARGET}_${FILE}_p
|
add_custom_target(${TARGET}_${FILE}_p
|
||||||
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)
|
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)
|
||||||
#add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p)
|
#add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p)
|
||||||
endforeach(_in_FILE ${ARGN})
|
endforeach()
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
|
||||||
|
@ -195,9 +197,9 @@ macro(rpcproxy TARGET)
|
||||||
|
|
||||||
add_library(${TARGET}_proxy ${SOURCE})
|
add_library(${TARGET}_proxy ${SOURCE})
|
||||||
add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS})
|
add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS})
|
||||||
endmacro(rpcproxy)
|
endmacro()
|
||||||
|
|
||||||
macro (MACRO_IDL_FILES)
|
macro(idl_files)
|
||||||
custom_incdefs()
|
custom_incdefs()
|
||||||
foreach(_in_FILE ${ARGN})
|
foreach(_in_FILE ${ARGN})
|
||||||
get_filename_component(FILE ${_in_FILE} NAME_WE)
|
get_filename_component(FILE ${_in_FILE} NAME_WE)
|
||||||
|
@ -220,28 +222,29 @@ macro (MACRO_IDL_FILES)
|
||||||
PROPERTIES GENERATED TRUE)
|
PROPERTIES GENERATED TRUE)
|
||||||
add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c)
|
add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c)
|
||||||
add_dependencies(${FILE}_client psdk)
|
add_dependencies(${FILE}_client psdk)
|
||||||
endforeach(_in_FILE ${ARGN})
|
endforeach()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
endmacro (MACRO_IDL_FILES)
|
macro(add_typelib TARGET)
|
||||||
|
custom_incdefs()
|
||||||
macro(ADD_TYPELIB TARGET)
|
foreach(SOURCE ${ARGN})
|
||||||
custom_incdefs()
|
get_filename_component(FILE ${SOURCE} NAME_WE)
|
||||||
foreach(SOURCE ${ARGN})
|
set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)
|
||||||
get_filename_component(FILE ${SOURCE} NAME_WE)
|
add_custom_command(
|
||||||
set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb
|
||||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb
|
COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}
|
||||||
COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}
|
DEPENDS ${SOURCE})
|
||||||
DEPENDS ${SOURCE})
|
list(APPEND OBJECTS ${OBJECT})
|
||||||
list(APPEND OBJECTS ${OBJECT})
|
endforeach()
|
||||||
endforeach()
|
add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})
|
||||||
add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(add_idl_interface IDL_FILE)
|
macro(add_idl_interface IDL_FILE)
|
||||||
custom_incdefs()
|
custom_incdefs()
|
||||||
get_filename_component(FILE ${IDL_FILE} NAME_WE)
|
get_filename_component(FILE ${IDL_FILE} NAME_WE)
|
||||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c
|
add_custom_command(
|
||||||
COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c
|
||||||
DEPENDS ${IDL_FILE})
|
COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE}
|
||||||
|
DEPENDS ${IDL_FILE})
|
||||||
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE)
|
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
|
@ -6,7 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
|
||||||
|
|
||||||
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
||||||
|
|
||||||
ADD_INTERFACE_DEFINITIONS(atl_atliface_header atliface.idl)
|
add_interface_definitions(atl_atliface_header atliface.idl)
|
||||||
|
|
||||||
set_rc_compiler()
|
set_rc_compiler()
|
||||||
spec2def(atl.dll atl.spec)
|
spec2def(atl.dll atl.spec)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
ADD_TYPELIB(jsglobal jsglobal.idl)
|
add_typelib(jsglobal jsglobal.idl)
|
||||||
add_dependencies(jsglobal stdole2)
|
add_dependencies(jsglobal stdole2)
|
||||||
|
|
||||||
remove_definitions(-D_WIN32_WINNT=0x502)
|
remove_definitions(-D_WIN32_WINNT=0x502)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
ADD_TYPELIB(mshtml_tlb mshtml_tlb.idl)
|
add_typelib(mshtml_tlb mshtml_tlb.idl)
|
||||||
add_dependencies(mshtml_tlb stdole2)
|
add_dependencies(mshtml_tlb stdole2)
|
||||||
|
|
||||||
add_definitions(-D__WINESRC__)
|
add_definitions(-D__WINESRC__)
|
||||||
|
|
|
@ -9,7 +9,7 @@ add_definitions(
|
||||||
|
|
||||||
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
||||||
|
|
||||||
ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl)
|
add_interface_definitions(mshtml_nsiface_header nsiface.idl)
|
||||||
|
|
||||||
set_rc_compiler()
|
set_rc_compiler()
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
ADD_TYPELIB(msxml3_v1 msxml3_v1.idl)
|
|
||||||
|
add_typelib(msxml3_v1 msxml3_v1.idl)
|
||||||
add_dependencies(msxml3_v1 stdole2)
|
add_dependencies(msxml3_v1 stdole2)
|
||||||
|
|
||||||
remove_definitions(-D_WIN32_WINNT=0x502)
|
remove_definitions(-D_WIN32_WINNT=0x502)
|
||||||
|
|
|
@ -54,7 +54,8 @@ include_directories(
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
||||||
|
|
||||||
ADD_INTERFACE_DEFINITIONS(ole32idl dcom.idl irot.idl)
|
add_interface_definitions(ole32idl dcom.idl irot.idl)
|
||||||
|
|
||||||
rpcproxy(ole32
|
rpcproxy(ole32
|
||||||
dcom.idl
|
dcom.idl
|
||||||
ole32_unknwn.idl
|
ole32_unknwn.idl
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
ADD_TYPELIB(pstorec_tlb pstorec_tlb.idl)
|
add_typelib(pstorec_tlb pstorec_tlb.idl)
|
||||||
add_dependencies(pstorec_tlb stdole2)
|
add_dependencies(pstorec_tlb stdole2)
|
||||||
|
|
||||||
add_definitions(-D__WINESRC__)
|
add_definitions(-D__WINESRC__)
|
||||||
|
@ -15,12 +15,7 @@ list(APPEND SOURCE
|
||||||
add_library(pstorec SHARED ${SOURCE})
|
add_library(pstorec SHARED ${SOURCE})
|
||||||
|
|
||||||
set_module_type(pstorec win32dll)
|
set_module_type(pstorec win32dll)
|
||||||
|
target_link_libraries(pstorec uuid wine)
|
||||||
target_link_libraries(pstorec
|
|
||||||
uuid
|
|
||||||
wine)
|
|
||||||
|
|
||||||
add_importlibs(pstorec msvcrt kernel32 ntdll)
|
add_importlibs(pstorec msvcrt kernel32 ntdll)
|
||||||
|
|
||||||
add_dependencies(pstorec pstorec_tlb pstorec_def)
|
add_dependencies(pstorec pstorec_tlb pstorec_def)
|
||||||
add_cab_target(pstorec 1)
|
add_cab_target(pstorec 1)
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
|
|
||||||
ADD_TYPELIB(shdocvw_v1 shdocvw_v1.idl)
|
add_typelib(shdocvw_v1 shdocvw_v1.idl)
|
||||||
add_dependencies(shdocvw_v1 stdole2)
|
add_dependencies(shdocvw_v1 stdole2)
|
||||||
|
|
||||||
add_definitions(-D_SHDOCVW_)
|
add_definitions(-D_SHDOCVW_)
|
||||||
|
|
||||||
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
||||||
|
|
||||||
spec2def(shdocvw.dll shdocvw.spec)
|
spec2def(shdocvw.dll shdocvw.spec)
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
|
|
||||||
add_definitions(-D__WINESRC__)
|
add_definitions(-D__WINESRC__)
|
||||||
|
|
||||||
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
||||||
|
|
||||||
ADD_TYPELIB(std_ole_v2 std_ole_v2.idl)
|
add_typelib(std_ole_v2 std_ole_v2.idl)
|
||||||
|
|
||||||
spec2def(stdole2.tlb stdole2.tlb.spec)
|
spec2def(stdole2.tlb stdole2.tlb.spec)
|
||||||
|
|
||||||
|
@ -12,8 +11,5 @@ add_library(stdole2.tlb SHARED rsrc.rc
|
||||||
|
|
||||||
set_entrypoint(stdole2.tlb 0)
|
set_entrypoint(stdole2.tlb 0)
|
||||||
set_target_properties(stdole2.tlb PROPERTIES SUFFIX "")
|
set_target_properties(stdole2.tlb PROPERTIES SUFFIX "")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
add_dependencies(stdole2.tlb std_ole_v2)
|
add_dependencies(stdole2.tlb std_ole_v2)
|
||||||
add_cab_target(stdole2.tlb 1)
|
add_cab_target(stdole2.tlb 1)
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
|
|
||||||
add_definitions(-D__WINESRC__)
|
add_definitions(-D__WINESRC__)
|
||||||
|
|
||||||
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
||||||
|
|
||||||
ADD_TYPELIB(std_ole_v1 std_ole_v1.idl)
|
add_typelib(std_ole_v1 std_ole_v1.idl)
|
||||||
|
|
||||||
spec2def(stdole32.tlb stdole32.tlb.spec)
|
spec2def(stdole32.tlb stdole32.tlb.spec)
|
||||||
|
|
||||||
add_library(stdole32.tlb SHARED rsrc.rc
|
add_library(stdole32.tlb SHARED
|
||||||
|
rsrc.rc
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/stdole32.def)
|
${CMAKE_CURRENT_BINARY_DIR}/stdole32.def)
|
||||||
|
|
||||||
set_entrypoint(stdole32.tlb 0)
|
set_entrypoint(stdole32.tlb 0)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
LIST(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
amstream.idl
|
amstream.idl
|
||||||
amvideo.idl
|
amvideo.idl
|
||||||
austream.idl
|
austream.idl
|
||||||
|
@ -24,4 +24,4 @@ LIST(APPEND SOURCE
|
||||||
#vmrender.idl
|
#vmrender.idl
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_INTERFACE_DEFINITIONS(dxsdk ${SOURCE})
|
add_interface_definitions(dxsdk ${SOURCE})
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
LIST(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
# access.idl
|
# access.idl
|
||||||
activaut.idl
|
activaut.idl
|
||||||
activdbg.idl
|
activdbg.idl
|
||||||
|
@ -103,10 +103,9 @@ LIST(APPEND SOURCE
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
LIST(APPEND SOURCE
|
LIST(APPEND SOURCE
|
||||||
wincodec.idl
|
wincodec.idl
|
||||||
wuapi.idl
|
wuapi.idl)
|
||||||
)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
ADD_INTERFACE_DEFINITIONS(psdk ${SOURCE})
|
add_interface_definitions(psdk ${SOURCE})
|
||||||
|
|
||||||
ADD_TYPELIB(stdole2 stdole2.idl)
|
add_typelib(stdole2 stdole2.idl)
|
||||||
|
|
|
@ -7,7 +7,9 @@ list(APPEND SOURCE
|
||||||
svcctl.idl
|
svcctl.idl
|
||||||
wlansvc.idl)
|
wlansvc.idl)
|
||||||
|
|
||||||
MACRO_IDL_FILES(${SOURCE})
|
idl_files(${SOURCE})
|
||||||
|
|
||||||
remove_definitions(-D_WIN32_WINNT=0x502)
|
remove_definitions(-D_WIN32_WINNT=0x502)
|
||||||
add_definitions(-D_WIN32_WINNT=0x600)
|
add_definitions(-D_WIN32_WINNT=0x600)
|
||||||
MACRO_IDL_FILES(pnp.idl)
|
|
||||||
|
idl_files(pnp.idl)
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
|
|
||||||
ADD_INTERFACE_DEFINITIONS(wineheaders itss.idl wined3d.idl)
|
add_interface_definitions(wineheaders itss.idl wined3d.idl)
|
||||||
|
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
epm.idl
|
epm.idl
|
||||||
irot.idl)
|
irot.idl)
|
||||||
|
|
||||||
MACRO_IDL_FILES(${SOURCE})
|
idl_files(${SOURCE})
|
||||||
ADD_INTERFACE_DEFINITIONS(winesdk ${SOURCE})
|
add_interface_definitions(winesdk ${SOURCE})
|
||||||
|
|
Loading…
Reference in a new issue