Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-22 18:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SDK] One step further towards ReactOS source code tree restructure: the sdk folder that groups includes, libraries and tools. CORE-9111

Browse source 
svn path=/trunk/; revision=71184
This commit is contained in:
Amine Khaldi 2016-04-20 12:36:25 +00:00
parent e85488750c
commit 08a0346e9f
5109 changed files with 499 additions and 773 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
reactos/CMakeLists.txt
View file

@ -19,7 +19,7 @@ endif()
project(REACTOS)
# Versioning
include(include/reactos/version.cmake)
include(sdk/include/reactos/version.cmake)
# Don't escape preprocessor definition values added via add_definitions
cmake_policy(SET CMP0005 OLD)
@ -98,13 +98,13 @@ if(NOT CMAKE_CROSSCOMPILING)
add_compile_flags("-fshort-wchar -Wno-multichar")
endif()
include_directories(include/host)
include_directories(sdk/include/host)
if(NOT MSVC)
add_subdirectory(dll/win32/dbghelp)
endif()
add_subdirectory(tools)
add_subdirectory(lib)
add_subdirectory(sdk/tools)
add_subdirectory(sdk/lib)
if(NOT NEW_STYLE_BUILD)
if(NOT MSVC)
@ -227,32 +227,32 @@ else()
include(cmake/widl-support.cmake)
include_directories(
include
include/psdk
include/dxsdk
${REACTOS_BINARY_DIR}/include
${REACTOS_BINARY_DIR}/include/psdk
${REACTOS_BINARY_DIR}/include/dxsdk
${REACTOS_BINARY_DIR}/include/ddk
${REACTOS_BINARY_DIR}/include/reactos
include/crt
include/ddk
include/ndk
include/reactos
include/reactos/libs)
sdk/include
sdk/include/psdk
sdk/include/dxsdk
${REACTOS_BINARY_DIR}/sdk/include
${REACTOS_BINARY_DIR}/sdk/include/psdk
${REACTOS_BINARY_DIR}/sdk/include/dxsdk
${REACTOS_BINARY_DIR}/sdk/include/ddk
${REACTOS_BINARY_DIR}/sdk/include/reactos
sdk/include/crt
sdk/include/ddk
sdk/include/ndk
sdk/include/reactos
sdk/include/reactos/libs)
if(ARCH STREQUAL "arm")
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/arm)
endif()
add_dependency_header()
add_subdirectory(include/xdk)
add_subdirectory(include/psdk)
add_subdirectory(include/dxsdk)
add_subdirectory(include/reactos/wine)
add_subdirectory(include/reactos/mc)
add_subdirectory(include/asm)
add_subdirectory(sdk/include/xdk)
add_subdirectory(sdk/include/psdk)
add_subdirectory(sdk/include/dxsdk)
add_subdirectory(sdk/include/reactos/wine)
add_subdirectory(sdk/include/reactos/mc)
add_subdirectory(sdk/include/asm)
if(NO_ROSSYM)
include(cmake/baseaddress_dwarf.cmake)
@ -271,12 +271,12 @@ else()
add_subdirectory(dll)
add_subdirectory(drivers)
add_subdirectory(hal)
add_subdirectory(lib)
add_subdirectory(sdk/lib)
add_subdirectory(media)
add_subdirectory(modules)
add_subdirectory(ntoskrnl)
add_subdirectory(subsystems)
add_subdirectory(tools/wpp)
add_subdirectory(sdk/tools/wpp)
add_subdirectory(win32ss)
# Create the registry hives
@ -285,7 +285,7 @@ else()
# Create {bootcd, livecd, bootcdregtest}.lst
create_iso_lists()
file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/sdk/include/reactos)
add_dependency_footer()
endif()

2
reactos/base/applications/charmap_new/CMakeLists.txt
View file

@ -8,7 +8,7 @@ if(NOT MSVC)
endif()
include_directories(
${REACTOS_SOURCE_DIR}/lib/atl
${REACTOS_SOURCE_DIR}/sdk/lib/atl
includes)
list(APPEND SOURCE

2
reactos/base/applications/games/solitaire/CMakeLists.txt
View file

@ -1,6 +1,6 @@
set_cpp(WITH_RUNTIME)
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/cardlib)
list(APPEND SOURCE
solcreate.cpp

2
reactos/base/applications/games/spider/CMakeLists.txt
View file

@ -2,7 +2,7 @@
set_cpp(WITH_RUNTIME)
include_directories(
${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib
${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/cardlib
${CMAKE_CURRENT_SOURCE_DIR})
list(APPEND SOURCE

4
reactos/base/applications/msconfig_new/CMakeLists.txt
View file

@ -6,8 +6,8 @@ set_cpp(WITH_RUNTIME WITH_EXCEPTIONS)
include_directories(
.
comctl32ex
${REACTOS_SOURCE_DIR}/include/c++
${REACTOS_SOURCE_DIR}/lib/atl)
${REACTOS_SOURCE_DIR}/sdk/include/c++
${REACTOS_SOURCE_DIR}/sdk/lib/atl)
list(APPEND C_SOURCE
comctl32ex/comctl32supp.c

2
reactos/base/applications/mscutils/devmgmt/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/dll/devmgr)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/dll/devmgr)
add_executable(devmgmt devmgmt.c devmgmt.rc)
set_module_type(devmgmt win32gui UNICODE)

2
reactos/base/applications/mspaint/CMakeLists.txt
View file

@ -2,7 +2,7 @@ project(MSPAINT)
set_cpp(WITH_RUNTIME)
include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
list(APPEND SOURCE
dialogs.cpp

2
reactos/base/applications/network/netsh/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
add_executable(netsh netsh.c)
target_link_libraries(netsh wine)
set_module_type(netsh win32cui UNICODE)

2
reactos/base/applications/network/wlanconf/CMakeLists.txt
View file

@ -1,7 +1,7 @@
include_directories(
BEFORE include
${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio)
${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/ndisuio)
add_executable(wlanconf wlanconf.c wlanconf.rc)
set_module_type(wlanconf win32cui UNICODE)

2
reactos/base/applications/rapps/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/lib/cryptlib)
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cryptlib)
list(APPEND SOURCE
aboutdlg.c

4
reactos/base/applications/rapps_new/CMakeLists.txt
View file

@ -2,8 +2,8 @@ project(RAPPS_NEW)
set_cpp(WITH_RUNTIME)
include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
include_directories(${REACTOS_SOURCE_DIR}/lib/cryptlib)
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cryptlib)
list(APPEND SOURCE
aboutdlg.cpp

2
reactos/base/applications/winhlp32/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_definitions(
-D__ROS_LONG64__

2
reactos/base/applications/wordpad/CMakeLists.txt
View file

@ -2,7 +2,7 @@
remove_definitions(-D_WIN32_IE=0x600)
add_definitions(-D__ROS_LONG64__)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
list(APPEND SOURCE
olecallback.c

4
reactos/base/services/eventlog/CMakeLists.txt
View file

@ -1,9 +1,9 @@
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/idl
${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl
${CMAKE_CURRENT_BINARY_DIR})
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/eventlogrpc.idl)
list(APPEND SOURCE
eventlog.c

6
reactos/base/services/rpcss/CMakeLists.txt
View file

@ -1,7 +1,7 @@
add_rpc_files(server
${REACTOS_SOURCE_DIR}/include/reactos/wine/epm.idl
${REACTOS_SOURCE_DIR}/include/reactos/wine/irot.idl)
${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/epm.idl
${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine/irot.idl)
list(APPEND SOURCE
@ -13,7 +13,7 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/epm_s.c
${CMAKE_CURRENT_BINARY_DIR}/irot_s.c)
include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine)
include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos/wine)
add_executable(rpcss ${SOURCE} rpcss.rc)
target_link_libraries(rpcss ${PSEH_LIB} wine)
set_module_type(rpcss win32cui UNICODE)

4
reactos/base/services/schedsvc/CMakeLists.txt
View file

@ -1,6 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/atsvc.idl)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/atsvc.idl)
spec2def(schedsvc.dll schedsvc.spec ADD_IMPORTLIB)
add_library(schedsvc SHARED

4
reactos/base/services/srvsvc/CMakeLists.txt
View file

@ -1,6 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/srvsvc.idl)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/srvsvc.idl)
spec2def(srvsvc.dll srvsvc.spec ADD_IMPORTLIB)
add_library(srvsvc SHARED

4
reactos/base/services/umpnpmgr/CMakeLists.txt
View file

@ -1,6 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/pnp.idl)
spec2def(umpnpmgr.dll umpnpmgr.spec ADD_IMPORTLIB)
add_library(umpnpmgr SHARED

4
reactos/base/services/wkssvc/CMakeLists.txt
View file

@ -1,6 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/wkssvc.idl)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/wkssvc.idl)
spec2def(wkssvc.dll wkssvc.spec ADD_IMPORTLIB)
add_library(wkssvc SHARED

4
reactos/base/services/wlansvc/CMakeLists.txt
View file

@ -1,6 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/wlansvc.idl)
list(APPEND SOURCE
wlansvc.c

6
reactos/base/setup/usetup/CMakeLists.txt
View file

@ -3,9 +3,9 @@ add_definitions(${I18N_DEFS})
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${REACTOS_SOURCE_DIR}/lib/inflib
${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib
${REACTOS_SOURCE_DIR}/include/reactos/drivers)
${REACTOS_SOURCE_DIR}/sdk/lib/inflib
${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib
${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
list(APPEND SOURCE
interface/usetup.c

2
reactos/base/shell/cmd/CMakeLists.txt
View file

@ -3,7 +3,7 @@ add_definitions(
-DANONYMOUSUNIONS
-D_DEBUG_MEM)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
list(APPEND SOURCE
alias.c

2
reactos/base/shell/explorer/CMakeLists.txt
View file

@ -2,7 +2,7 @@ PROJECT(SHELL)
set_cpp(WITH_RUNTIME)
include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
list(APPEND SOURCE
desktop.cpp

2
reactos/base/shell/rshell/CMakeLists.txt
View file

@ -3,7 +3,7 @@ PROJECT(SHELL)
set_cpp(WITH_RUNTIME)
include_directories(
${REACTOS_SOURCE_DIR}/lib/atl
${REACTOS_SOURCE_DIR}/sdk/lib/atl
${REACTOS_SOURCE_DIR}/dll/win32/shell32/shellmenu)
spec2def(rshell.dll rshell.spec ADD_IMPORTLIB)

2
reactos/base/system/chkdsk/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fmifs)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/fmifs)
add_executable(chkdsk chkdsk.c chkdsk.rc)
set_module_type(chkdsk win32cui UNICODE)

2
reactos/base/system/expand/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_executable(expand expand.c expand.rc)
set_module_type(expand win32cui)
add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll)

2
reactos/base/system/format/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fmifs)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/fmifs)
add_executable(format format.c format.rc)
set_module_type(format win32cui UNICODE)

2
reactos/base/system/lsass/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys)
add_executable(lsass lsass.c lsass.rc)
set_module_type(lsass win32gui UNICODE)
add_importlibs(lsass advapi32 lsasrv samsrv msvcrt kernel32 ntdll)

2
reactos/base/system/msiexec/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
list(APPEND SOURCE
msiexec.c

6
reactos/base/system/services/CMakeLists.txt
View file

@ -1,10 +1,10 @@
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/subsys
${REACTOS_SOURCE_DIR}/include/reactos/idl
${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys
${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl
${CMAKE_CURRENT_BINARY_DIR})
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/svcctl.idl)
list(APPEND SOURCE
config.c

2
reactos/base/system/smss/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys)
list(APPEND SOURCE
crashdmp.c

4
reactos/base/system/winlogon/CMakeLists.txt
View file

@ -1,9 +1,9 @@
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/idl
${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl
${CMAKE_CURRENT_BINARY_DIR})
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/winreg.idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/winreg.idl)
list(APPEND SOURCE
environment.c

5
reactos/boot/environ/CMakeLists.txt
View file

@ -2,8 +2,9 @@
include_directories(BEFORE include)
include_directories(BEFORE include/efi)
include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs)
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cmlib)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs)
include_directories(${REACTOS_SOURCE_DIR}/drivers/filesystems)
add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_)

4
reactos/boot/environ/lib/io/etfs.c
View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/
#include "bl.h"
#include "../drivers/filesystems/cdfs_new/cd.h"
#include <bl.h>
#include <cdfs_new/cd.h>
typedef struct _RAW_ET_VD
{
UCHAR BootIndicator;

4
reactos/boot/environ/lib/io/fat.c
View file

@ -8,8 +8,8 @@
/* INCLUDES ******************************************************************/
#include "bl.h"
#include "../drivers/filesystems/fs_rec/fs_rec.h"
#include <bl.h>
#include <fs_rec/fs_rec.h>
/* DATA VARIABLES ************************************************************/

6
reactos/boot/freeldr/freeldr/CMakeLists.txt
View file

@ -26,9 +26,9 @@ endif()
include_directories(BEFORE include)
include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/elf)
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cmlib)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/elf)
add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_)

10
reactos/cmake/CMakeMacros.cmake
View file

@ -70,8 +70,8 @@ macro(set_cpp)
if(__cppopts_WITH_STL)
set(CPP_USE_STL 1)
if(MSVC)
add_definitions(-DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++)
include_directories(${REACTOS_SOURCE_DIR}/include/c++/stlport)
add_definitions(-DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/sdk/include/c++)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/c++/stlport)
else()
replace_compile_flags("-nostdinc" " ")
endif()
@ -117,13 +117,13 @@ function(add_message_headers _type)
get_filename_component(FILE ${_in_FILE} NAME_WE)
macro_mc(${_flag} ${FILE})
add_custom_command(
OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h
OUTPUT ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h
COMMAND ${COMMAND_MC} ${MC_FLAGS}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc)
set_source_files_properties(
${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc
${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc
PROPERTIES GENERATED TRUE)
add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc)
add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/sdk/include/reactos/${FILE}.rc)
endforeach()
endfunction()

6
reactos/cmake/gcc.cmake
View file

@ -259,7 +259,7 @@ endif()
set(CMAKE_C_COMPILE_OBJECT "${CCACHE} <CMAKE_C_COMPILER> <DEFINES> ${_compress_debug_sections_flag} <FLAGS> -o <OBJECT> -c <SOURCE>")
# FIXME: Once the GCC toolchain bugs are fixed, add _compress_debug_sections_flag to CXX too
set(CMAKE_CXX_COMPILE_OBJECT "${CCACHE} <CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${_compress_debug_sections_flag} -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${_compress_debug_sections_flag} -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/sdk/include/asm -I${REACTOS_BINARY_DIR}/sdk/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <FLAGS> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${I18N_DEFS} <DEFINES> <SOURCE> <OBJECT>")
set(CMAKE_DEPFILE_FLAGS_RC "--preprocessor \"${MINGW_TOOLCHAIN_PREFIX}gcc${MINGW_TOOLCHAIN_SUFFIX} -E -xc-header -MMD -MF <DEPFILE> -MT <OBJECT>\" ")
@ -379,7 +379,7 @@ function(spec2def _dllname _spec_file)
endfunction()
macro(macro_mc FLAG FILE)
set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos)
set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/sdk/include/reactos -h ${REACTOS_BINARY_DIR}/sdk/include/reactos)
endmacro()
# PSEH lib, needed with mingw
@ -425,7 +425,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres
add_custom_command(
OUTPUT ${_object_file}
COMMAND ${CMAKE_ASM_COMPILER} -x assembler-with-cpp -o ${_object_file} -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm -I${REACTOS_SOURCE_DIR}/boot/freeldr -D__ASM__ -c ${_asm_file}
COMMAND ${CMAKE_ASM_COMPILER} -x assembler-with-cpp -o ${_object_file} -I${REACTOS_SOURCE_DIR}/sdk/include/asm -I${REACTOS_BINARY_DIR}/sdk/include/asm -I${REACTOS_SOURCE_DIR}/boot/freeldr -D__ASM__ -c ${_asm_file}
DEPENDS ${_asm_file})
add_custom_command(

10
reactos/cmake/msvc.cmake
View file

@ -143,11 +143,11 @@ else()
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_nologo_flag} <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>")
if(ARCH STREQUAL "arm")
set(CMAKE_ASM_COMPILE_OBJECT
"cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
"cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
"<CMAKE_ASM_COMPILER> -nologo -o <OBJECT> <OBJECT>.tmp")
else()
set(CMAKE_ASM_COMPILE_OBJECT
"cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
"cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
"<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
endif()
endif()
@ -374,7 +374,7 @@ function(spec2def _dllname _spec_file)
endfunction()
macro(macro_mc FLAG FILE)
set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos)
set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/sdk/include/reactos -h ${REACTOS_BINARY_DIR}/sdk/include/reactos)
endmacro()
# PSEH workaround
@ -397,7 +397,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres
add_custom_command(
OUTPUT ${_temp_file}
COMMAND ${CMAKE_C_COMPILER} /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm /I${REACTOS_SOURCE_DIR}/boot/freeldr /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file}
COMMAND ${CMAKE_C_COMPILER} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm /I${REACTOS_SOURCE_DIR}/boot/freeldr /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file}
DEPENDS ${_asm_file})
if(ARCH STREQUAL "arm")
@ -448,7 +448,7 @@ macro(add_asm_files _target)
endif()
add_custom_command(
OUTPUT ${_preprocessed_asm_file} ${_object_file}
COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_source_file_full_path} > ${_preprocessed_asm_file} && ${_pp_asm_compile_command}
COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_source_file_full_path} > ${_preprocessed_asm_file} && ${_pp_asm_compile_command}
DEPENDS ${_source_file_full_path})
set_source_files_properties(${_object_file} PROPERTIES EXTERNAL_OBJECT 1)
list(APPEND ${_target} ${_object_file})

4
reactos/dll/3rdparty/libjpeg/CMakeLists.txt vendored
View file

@ -7,8 +7,8 @@ add_definitions(
-Dmain=mainptr)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg
${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/libjpeg
${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib)
add_library(libjpeg SHARED
jaricom.c

4
reactos/dll/3rdparty/libpng/CMakeLists.txt vendored
View file

@ -6,8 +6,8 @@ add_definitions(
-DPNG_BUILD_DLL)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng
${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/libpng
${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib)
list(APPEND SOURCE
png.c

4
reactos/dll/3rdparty/libtiff/CMakeLists.txt vendored
View file

@ -7,8 +7,8 @@ add_definitions(
-DUSE_WIN32_FILEIO)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff
${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/libtiff
${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib)
list(APPEND SOURCE
mkg3states.c

4
reactos/dll/3rdparty/libxslt/CMakeLists.txt vendored
View file

@ -1,6 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libxslt
${REACTOS_SOURCE_DIR}/lib/3rdparty/libwin-iconv)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/libxslt
${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/libwin-iconv)
add_definitions(
-DHAVE_CONFIG_H

4
reactos/dll/3rdparty/mbedtls/CMakeLists.txt vendored
View file

@ -1,8 +1,8 @@
spec2def(mbedtls.dll mbedtls.spec ADD_IMPORTLIB)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs
${REACTOS_SOURCE_DIR}/include/reactos/zlib)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs
${REACTOS_SOURCE_DIR}/sdk/include/reactos/zlib)
list(APPEND src
_reactos_strsafe_wrapper.c

2
reactos/dll/cpl/appwiz/CMakeLists.txt
View file

@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(-D__WINESRC__)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(appwiz.cpl appwiz.spec)
list(APPEND SOURCE

2
reactos/dll/cpl/inetcpl/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(inetcpl.cpl inetcpl.spec)
list(APPEND SOURCE

2
reactos/dll/cpl/usrmgr/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(usrmgr.cpl usrmgr.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/amstream/CMakeLists.txt
View file

@ -3,7 +3,7 @@ add_definitions(
-D__WINESRC__
-DWIDL_C_INLINE_WRAPPERS)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(amstream.dll amstream.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3d8/CMakeLists.txt
View file

@ -3,7 +3,7 @@ add_definitions(
-D__WINESRC__
-DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3d8.dll d3d8.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3d9/CMakeLists.txt
View file

@ -3,7 +3,7 @@ add_definitions(
-D__WINESRC__
-DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3d9.dll d3d9.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt
View file

@ -3,7 +3,7 @@ add_definitions(
-D__WINESRC__
-DDIRECT3D_VERSION=0x0900)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3drm/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3drm.dll d3drm.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_24.dll d3dx9_24.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_25.dll d3dx9_25.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_26.dll d3dx9_26.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_27.dll d3dx9_27.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_28.dll d3dx9_28.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_29.dll d3dx9_29.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_30.dll d3dx9_30.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_31.dll d3dx9_31.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_32.dll d3dx9_32.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_33.dll d3dx9_33.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_34.dll d3dx9_34.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_35.dll d3dx9_35.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__ -Dcopysignf=_copysignf)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_37.dll d3dx9_37.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_38.dll d3dx9_38.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_39.dll d3dx9_39.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_40.dll d3dx9_40.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_41.dll d3dx9_41.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_42.dll d3dx9_42.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dx9_43/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dx9_43.dll d3dx9_43.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/d3dxof/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(d3dxof.dll d3dxof.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/directx/wine/ddraw/CMakeLists.txt
View file

@ -3,7 +3,7 @@ add_definitions(
-D__WINESRC__
-DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(ddraw.dll ddraw.spec ADD_IMPORTLIB)

2
reactos/dll/directx/wine/devenum/CMakeLists.txt
View file

@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600)
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(devenum.dll devenum.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/dinput/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(dinput.dll dinput.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/directx/wine/dinput8/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(dinput8.dll dinput8.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/directx/wine/dmusic/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(dmusic.dll dmusic.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/dplay/CMakeLists.txt
View file

@ -1,5 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(dplay.dll dplay.spec)
add_library(dplay SHARED

2
reactos/dll/directx/wine/dplayx/CMakeLists.txt
View file

@ -3,7 +3,7 @@ add_definitions(
-DCOM_NO_WINDOWS_H
-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(dplayx.dll dplayx.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/directx/wine/dsound/CMakeLists.txt
View file

@ -4,7 +4,7 @@ add_definitions(
-D_USE_MATH_DEFINES
-D__WINESRC__)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(dsound.dll dsound.spec ADD_IMPORTLIB)
add_library(dsound SHARED

2
reactos/dll/directx/wine/dxdiagn/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(dxdiagn.dll dxdiagn.spec)
add_idl_headers(dxdiagn_idlheader fil_data.idl)

2
reactos/dll/directx/wine/msdmo/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(msdmo.dll msdmo.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/qedit/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(qedit.dll qedit.spec)
list(APPEND SOURCE

2
reactos/dll/directx/wine/quartz/CMakeLists.txt
View file

@ -8,7 +8,7 @@ add_definitions(
-DWINE_REGISTER_DLL
-DPROXY_DELEGATION)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(quartz.dll quartz.spec)
add_rpcproxy_files(quartz_strmif.idl)

2
reactos/dll/directx/wine/wined3d/CMakeLists.txt
View file

@ -5,7 +5,7 @@ add_definitions(
-DUSE_WIN32_OPENGL
-Dcopysignf=_copysignf)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
# We name this d3dwine.dll, because the Virtualbox additions ship with a custom wined3d.dll
# and it breaks everything if it is installed.

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

@ -8,7 +8,7 @@ add_definitions(
include_directories(
BEFORE include
${REACTOS_SOURCE_DIR}/include/reactos/subsys)
${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys)
list(APPEND SOURCE
csr/api.c

2
reactos/dll/shellext/acppage/CMakeLists.txt
View file

@ -7,7 +7,7 @@ if(NOT MSVC)
endif()
include_directories(
${REACTOS_SOURCE_DIR}/lib/atl
${REACTOS_SOURCE_DIR}/sdk/lib/atl
${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp
${REACTOS_SOURCE_DIR})
spec2def(acppage.dll acppage.spec ADD_IMPORTLIB)

2
reactos/dll/shellext/ntobjshex/CMakeLists.txt
View file

@ -9,7 +9,7 @@ if(NOT MSVC)
endif()
include_directories(
${REACTOS_SOURCE_DIR}/lib/atl
${REACTOS_SOURCE_DIR}/sdk/lib/atl
${REACTOS_SOURCE_DIR})
spec2def(ntobjshex.dll ntobjshex.spec)

2
reactos/dll/shellext/stobject/CMakeLists.txt
View file

@ -9,7 +9,7 @@ if(NOT MSVC)
endif()
include_directories(
${REACTOS_SOURCE_DIR}/lib/atl
${REACTOS_SOURCE_DIR}/sdk/lib/atl
${REACTOS_SOURCE_DIR})
spec2def(stobject.dll stobject.spec)

2
reactos/dll/win32/activeds/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(activeds.dll activeds.spec)
list(APPEND SOURCE

2
reactos/dll/win32/actxprxy/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_definitions(-DWINE_REGISTER_DLL -DPROXY_DELEGATION)
spec2def(actxprxy.dll actxprxy.spec)

14
reactos/dll/win32/advapi32/CMakeLists.txt
View file

@ -6,16 +6,16 @@ remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/idl
${REACTOS_SOURCE_DIR}/include/reactos/drivers/ksecdd
${REACTOS_SOURCE_DIR}/lib/cryptlib
${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl
${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/ksecdd
${REACTOS_SOURCE_DIR}/sdk/lib/cryptlib
${CMAKE_CURRENT_BINARY_DIR})
add_rpc_files(client
${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl
${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl
${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl
${REACTOS_SOURCE_DIR}/include/reactos/idl/winreg.idl)
${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/eventlogrpc.idl
${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/lsa.idl
${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/svcctl.idl
${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/winreg.idl)
list(APPEND SOURCE
misc/dllmain.c

2
reactos/dll/win32/advpack/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(advpack.dll advpack.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/win32/atl/CMakeLists.txt
View file

@ -6,7 +6,7 @@ add_definitions(
-D__WINESRC__
-D_ATL_VER=_ATL_VER_30)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(atl.dll atl.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/win32/atl100/CMakeLists.txt
View file

@ -6,7 +6,7 @@ add_definitions(
-D__WINESRC__
-D_ATL_VER=_ATL_VER_100)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(atl100.dll atl100.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/win32/avicap32/CMakeLists.txt
View file

@ -1,7 +1,7 @@
spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_library(avicap32 SHARED
avicap32.c

2
reactos/dll/win32/avifil32/CMakeLists.txt
View file

@ -3,7 +3,7 @@ remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(-D__WINESRC__ -DENTRY_PREFIX=avifil32_)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB)
add_rpcproxy_files(avifil32.idl)

4
reactos/dll/win32/bcrypt/CMakeLists.txt
View file

@ -1,8 +1,8 @@
add_definitions(-D__WINESRC__)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/wine
${REACTOS_SOURCE_DIR}/include/reactos/libs/mbedtls)
${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine
${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/mbedtls)
spec2def(bcrypt.dll bcrypt.spec ADD_IMPORTLIB)
list(APPEND SOURCE

2
reactos/dll/win32/browseui/CMakeLists.txt
View file

@ -2,7 +2,7 @@ PROJECT(SHELL)
set_cpp(WITH_RUNTIME)
include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl)
spec2def(browseui.dll browseui.spec ADD_IMPORTLIB)
list(APPEND SOURCE

Some files were not shown because too many files have changed in this diff Show more