From c702cc0d5a62a53fbce93dd9c1777af26bd70424 Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Sat, 18 Sep 2010 15:22:08 +0000 Subject: [PATCH] [CMAKE] Generalize CMAKE_C_CREATE_SHARED_LIBRARY and remove per project instances. Thanks to Amine for regexxer tool discovery ;) svn path=/branches/cmake-bringup/; revision=48804 --- CMakeLists.txt | 1 + boot/CMakeLists.txt | 2 +- dll/ntdll/CMakeLists.txt | 2 +- dll/win32/acledit/CMakeLists.txt | 2 +- dll/win32/aclui/CMakeLists.txt | 2 +- dll/win32/activeds/CMakeLists.txt | 2 +- dll/win32/advapi32/CMakeLists.txt | 2 +- dll/win32/advpack/CMakeLists.txt | 2 +- dll/win32/authz/CMakeLists.txt | 2 +- dll/win32/avicap32/CMakeLists.txt | 2 +- dll/win32/batt/CMakeLists.txt | 2 +- dll/win32/beepmidi/CMakeLists.txt | 2 +- dll/win32/cabinet/CMakeLists.txt | 2 +- dll/win32/cards/CMakeLists.txt | 2 +- dll/win32/clusapi/CMakeLists.txt | 2 +- dll/win32/compstui/CMakeLists.txt | 2 +- dll/win32/credui/CMakeLists.txt | 2 +- dll/win32/crtdll/CMakeLists.txt | 2 +- dll/win32/crypt32/CMakeLists.txt | 2 +- dll/win32/cryptdll/CMakeLists.txt | 2 +- dll/win32/dbghelp/CMakeLists.txt | 2 +- dll/win32/dciman32/CMakeLists.txt | 2 +- dll/win32/dhcpcsvc/CMakeLists.txt | 2 +- dll/win32/dnsapi/CMakeLists.txt | 2 +- dll/win32/dwmapi/CMakeLists.txt | 2 +- dll/win32/faultrep/CMakeLists.txt | 2 +- dll/win32/fmifs/CMakeLists.txt | 2 +- dll/win32/fusion/CMakeLists.txt | 2 +- dll/win32/gdi32/CMakeLists.txt | 2 +- dll/win32/getuname/CMakeLists.txt | 2 +- dll/win32/hid/CMakeLists.txt | 2 +- dll/win32/httpapi/CMakeLists.txt | 2 +- dll/win32/iccvid/CMakeLists.txt | 2 +- dll/win32/icmp/CMakeLists.txt | 2 +- dll/win32/imaadp32.acm/CMakeLists.txt | 2 +- dll/win32/imagehlp/CMakeLists.txt | 2 +- dll/win32/imm32/CMakeLists.txt | 2 +- dll/win32/initpki/CMakeLists.txt | 2 +- dll/win32/iphlpapi/CMakeLists.txt | 2 +- dll/win32/itircl/CMakeLists.txt | 2 +- dll/win32/kernel32/CMakeLists.txt | 2 +- dll/win32/loadperf/CMakeLists.txt | 2 +- dll/win32/lpk/CMakeLists.txt | 2 +- dll/win32/mapi32/CMakeLists.txt | 2 +- dll/win32/mciavi32/CMakeLists.txt | 2 +- dll/win32/mcicda/CMakeLists.txt | 2 +- dll/win32/mciqtz32/CMakeLists.txt | 2 +- dll/win32/mciseq/CMakeLists.txt | 2 +- dll/win32/mciwave/CMakeLists.txt | 2 +- dll/win32/mmdrv/CMakeLists.txt | 2 +- dll/win32/modemui/CMakeLists.txt | 2 +- dll/win32/mpr/CMakeLists.txt | 2 +- dll/win32/mprapi/CMakeLists.txt | 2 +- dll/win32/msadp32.acm/CMakeLists.txt | 2 +- dll/win32/msafd/CMakeLists.txt | 2 +- dll/win32/mscms/CMakeLists.txt | 2 +- dll/win32/mscoree/CMakeLists.txt | 2 +- dll/win32/msg711.acm/CMakeLists.txt | 2 +- dll/win32/msgina/CMakeLists.txt | 2 +- dll/win32/msgsm32.acm/CMakeLists.txt | 2 +- dll/win32/msimg32/CMakeLists.txt | 2 +- dll/win32/msnet32/CMakeLists.txt | 2 +- dll/win32/mssign32/CMakeLists.txt | 2 +- dll/win32/mssip32/CMakeLists.txt | 2 +- dll/win32/msvcrt/CMakeLists.txt | 2 +- dll/win32/msvcrt20/CMakeLists.txt | 2 +- dll/win32/msvcrt40/CMakeLists.txt | 2 +- dll/win32/msvfw32/CMakeLists.txt | 2 +- dll/win32/msvidc32/CMakeLists.txt | 2 +- dll/win32/mswsock/CMakeLists.txt | 2 +- dll/win32/nddeapi/CMakeLists.txt | 2 +- dll/win32/netapi32/CMakeLists.txt | 2 +- dll/win32/newdev/CMakeLists.txt | 2 +- dll/win32/ntdsapi/CMakeLists.txt | 2 +- dll/win32/ntlanman/CMakeLists.txt | 2 +- dll/win32/ntprint/CMakeLists.txt | 2 +- dll/win32/olecli32/CMakeLists.txt | 2 +- dll/win32/oledlg/CMakeLists.txt | 2 +- dll/win32/olesvr32/CMakeLists.txt | 2 +- dll/win32/olethk32/CMakeLists.txt | 2 +- dll/win32/pidgen/CMakeLists.txt | 2 +- dll/win32/powrprof/CMakeLists.txt | 2 +- dll/win32/printui/CMakeLists.txt | 2 +- dll/win32/query/CMakeLists.txt | 2 +- dll/win32/rasapi32/CMakeLists.txt | 2 +- dll/win32/rasdlg/CMakeLists.txt | 2 +- dll/win32/rasman/CMakeLists.txt | 2 +- dll/win32/resutils/CMakeLists.txt | 2 +- dll/win32/samlib/CMakeLists.txt | 2 +- dll/win32/samsrv/CMakeLists.txt | 2 +- dll/win32/sccbase/CMakeLists.txt | 2 +- dll/win32/schannel/CMakeLists.txt | 2 +- dll/win32/sensapi/CMakeLists.txt | 2 +- dll/win32/serialui/CMakeLists.txt | 2 +- dll/win32/shlwapi/CMakeLists.txt | 2 +- dll/win32/slbcsp/CMakeLists.txt | 2 +- dll/win32/smdll/CMakeLists.txt | 2 +- dll/win32/sndblst/CMakeLists.txt | 2 +- dll/win32/snmpapi/CMakeLists.txt | 2 +- dll/win32/spoolss/CMakeLists.txt | 2 +- dll/win32/srclient/CMakeLists.txt | 2 +- dll/win32/sxs/CMakeLists.txt | 2 +- dll/win32/t2embed/CMakeLists.txt | 2 +- dll/win32/tapi32/CMakeLists.txt | 2 +- dll/win32/traffic/CMakeLists.txt | 2 +- dll/win32/updspapi/CMakeLists.txt | 2 +- dll/win32/url/CMakeLists.txt | 2 +- dll/win32/user32/CMakeLists.txt | 2 +- dll/win32/user32/user32.rc | 2 +- dll/win32/usp10/CMakeLists.txt | 2 +- dll/win32/uxtheme/CMakeLists.txt | 2 +- drivers/base/beep/CMakeLists.txt | 2 +- drivers/base/bootvid/CMakeLists.txt | 2 +- drivers/base/kdcom/CMakeLists.txt | 2 +- drivers/base/kddll/CMakeLists.txt | 2 +- drivers/base/nmidebug/CMakeLists.txt | 2 +- drivers/base/null/CMakeLists.txt | 2 +- drivers/battery/battc/CMakeLists.txt | 2 +- drivers/bus/acpi/CMakeLists.txt | 2 +- drivers/bus/isapnp/CMakeLists.txt | 2 +- drivers/bus/pci/CMakeLists.txt | 2 +- drivers/bus/pcix/CMakeLists.txt | 2 +- drivers/bus/pcmcia/CMakeLists.txt | 2 +- drivers/filesystems/cdfs/CMakeLists.txt | 2 +- drivers/filesystems/fastfat/CMakeLists.txt | 2 +- drivers/input/i8042prt/CMakeLists.txt | 2 +- drivers/input/kbdclass/CMakeLists.txt | 2 +- drivers/input/mouclass/CMakeLists.txt | 2 +- drivers/input/sermouse/CMakeLists.txt | 2 +- drivers/setup/blue/CMakeLists.txt | 2 +- drivers/storage/class/cdrom/CMakeLists.txt | 2 +- drivers/storage/class/class2/CMakeLists.txt | 2 +- drivers/storage/class/disk/CMakeLists.txt | 2 +- drivers/storage/class/ramdisk/CMakeLists.txt | 2 +- drivers/storage/floppy/CMakeLists.txt | 2 +- drivers/storage/ide/atapi/CMakeLists.txt | 2 +- drivers/storage/port/buslogic/CMakeLists.txt | 2 +- drivers/storage/scsiport/CMakeLists.txt | 2 +- drivers/video/font/ftfd/CMakeLists.txt | 2 +- drivers/video/videoprt/CMakeLists.txt | 2 +- drivers/wmi/CMakeLists.txt | 2 +- hal/CMakeLists.txt | 2 +- subsystems/win32/win32k/CMakeLists.txt | 2 +- 143 files changed, 143 insertions(+), 142 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f472cf4af75..55bdf5b1ece 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,6 +71,7 @@ add_definitions(-D_USE_32BIT_TIME_T) # Compiler Core add_definitions(-pipe -fms-extensions) +set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") # Debugging (Note: DWARF-4 on 4.5.1 when we ship) add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index d3e40b4dba6..6de591b74b2 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -156,7 +156,7 @@ endif(ARCH MATCHES i386) set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + list(APPEND FREELDR_SOURCE freeldr/freeldr/bootmgr.c diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index 3ec7ea1c3dc..93ba22cafcf 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-D__NTDLL__) add_definitions(-D_NTOSKRNL_) diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt index 2fb4ea4e00a..65983d79719 100644 --- a/dll/win32/acledit/CMakeLists.txt +++ b/dll/win32/acledit/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt index fe12fc3a7ac..ec3ff245b52 100644 --- a/dll/win32/aclui/CMakeLists.txt +++ b/dll/win32/aclui/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) add_definitions(-DSUPPORT_UXTHEME) diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt index 183251c5b7d..a1d1fcb2e6b 100644 --- a/dll/win32/activeds/CMakeLists.txt +++ b/dll/win32/activeds/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index dbc33390989..a6d25ff7003 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) add_definitions(-D_ADVAPI32_) diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt index abc5c7fc572..b3cb941f461 100644 --- a/dll/win32/advpack/CMakeLists.txt +++ b/dll/win32/advpack/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt index b87670e4304..4c2a62eafe9 100644 --- a/dll/win32/authz/CMakeLists.txt +++ b/dll/win32/authz/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt index bd3071303f5..8cfce5cd5aa 100644 --- a/dll/win32/avicap32/CMakeLists.txt +++ b/dll/win32/avicap32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt index 3d14dd00780..f10b053ddbb 100644 --- a/dll/win32/batt/CMakeLists.txt +++ b/dll/win32/batt/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/beepmidi/CMakeLists.txt b/dll/win32/beepmidi/CMakeLists.txt index 61ef3fa1341..9382be6d6aa 100644 --- a/dll/win32/beepmidi/CMakeLists.txt +++ b/dll/win32/beepmidi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/cabinet/CMakeLists.txt b/dll/win32/cabinet/CMakeLists.txt index 429be521f2b..f2b0af9c041 100644 --- a/dll/win32/cabinet/CMakeLists.txt +++ b/dll/win32/cabinet/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/cards/CMakeLists.txt b/dll/win32/cards/CMakeLists.txt index 16ea3c15f45..684988072e0 100644 --- a/dll/win32/cards/CMakeLists.txt +++ b/dll/win32/cards/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/clusapi/CMakeLists.txt b/dll/win32/clusapi/CMakeLists.txt index 1f678d6d1d3..17a54c3387c 100644 --- a/dll/win32/clusapi/CMakeLists.txt +++ b/dll/win32/clusapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/compstui/CMakeLists.txt b/dll/win32/compstui/CMakeLists.txt index 969ca30863f..c2d177981fb 100644 --- a/dll/win32/compstui/CMakeLists.txt +++ b/dll/win32/compstui/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt index bca94f98a9d..93e90e77a02 100644 --- a/dll/win32/credui/CMakeLists.txt +++ b/dll/win32/credui/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt index 1071ddacdd7..85074cac856 100644 --- a/dll/win32/crtdll/CMakeLists.txt +++ b/dll/win32/crtdll/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUSE_MSVCRT_PREFIX) add_definitions(-D_MSVCRT_LIB_) diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt index 597419d3c33..b5d34628fe4 100644 --- a/dll/win32/crypt32/CMakeLists.txt +++ b/dll/win32/crypt32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) add_definitions(-D_DLL -D__USE_CRTIMP) diff --git a/dll/win32/cryptdll/CMakeLists.txt b/dll/win32/cryptdll/CMakeLists.txt index 81f394895c5..840fb04585b 100644 --- a/dll/win32/cryptdll/CMakeLists.txt +++ b/dll/win32/cryptdll/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt index d50fd5eecc3..deec12c9bba 100644 --- a/dll/win32/dbghelp/CMakeLists.txt +++ b/dll/win32/dbghelp/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) add_definitions(-D_DLL -D__USE_CRTIMP) diff --git a/dll/win32/dciman32/CMakeLists.txt b/dll/win32/dciman32/CMakeLists.txt index ad6bc5c0a06..f80999d15b3 100644 --- a/dll/win32/dciman32/CMakeLists.txt +++ b/dll/win32/dciman32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/dhcpcsvc/CMakeLists.txt b/dll/win32/dhcpcsvc/CMakeLists.txt index 377a0496027..fbae3600529 100644 --- a/dll/win32/dhcpcsvc/CMakeLists.txt +++ b/dll/win32/dhcpcsvc/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(include) diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt index 860d1382419..13393033873 100644 --- a/dll/win32/dnsapi/CMakeLists.txt +++ b/dll/win32/dnsapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(include) include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/src) diff --git a/dll/win32/dwmapi/CMakeLists.txt b/dll/win32/dwmapi/CMakeLists.txt index 8ec97bded56..c9ec4b28702 100644 --- a/dll/win32/dwmapi/CMakeLists.txt +++ b/dll/win32/dwmapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/faultrep/CMakeLists.txt b/dll/win32/faultrep/CMakeLists.txt index bb1ac72c79f..f5657fcc65d 100644 --- a/dll/win32/faultrep/CMakeLists.txt +++ b/dll/win32/faultrep/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/fmifs/CMakeLists.txt b/dll/win32/fmifs/CMakeLists.txt index b8c6d15e344..7eb2faf0337 100644 --- a/dll/win32/fmifs/CMakeLists.txt +++ b/dll/win32/fmifs/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + spec2def(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/fmifs.spec ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt index 07970685f54..a4f1aa39588 100644 --- a/dll/win32/fusion/CMakeLists.txt +++ b/dll/win32/fusion/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/gdi32/CMakeLists.txt b/dll/win32/gdi32/CMakeLists.txt index 8229e6305e9..af5ef37b572 100644 --- a/dll/win32/gdi32/CMakeLists.txt +++ b/dll/win32/gdi32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) add_definitions(-D_DLL -D__USE_CRTIMP) diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt index 07ac4dfba09..99af5b0d371 100644 --- a/dll/win32/getuname/CMakeLists.txt +++ b/dll/win32/getuname/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/hid/CMakeLists.txt b/dll/win32/hid/CMakeLists.txt index 3243350a77d..a2352991bc9 100644 --- a/dll/win32/hid/CMakeLists.txt +++ b/dll/win32/hid/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt index 19fb05b7244..d22228d12e3 100644 --- a/dll/win32/httpapi/CMakeLists.txt +++ b/dll/win32/httpapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/iccvid/CMakeLists.txt b/dll/win32/iccvid/CMakeLists.txt index bb45cfc8706..95de98c06b6 100644 --- a/dll/win32/iccvid/CMakeLists.txt +++ b/dll/win32/iccvid/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/icmp/CMakeLists.txt b/dll/win32/icmp/CMakeLists.txt index d268807f241..0b3f0c21a82 100644 --- a/dll/win32/icmp/CMakeLists.txt +++ b/dll/win32/icmp/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/imaadp32.acm/CMakeLists.txt b/dll/win32/imaadp32.acm/CMakeLists.txt index c6ccb9ee1a9..f94bd7d8dc6 100644 --- a/dll/win32/imaadp32.acm/CMakeLists.txt +++ b/dll/win32/imaadp32.acm/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D_DLL -D__USE_CRTIMP) diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt index fb7bf07f2ec..a4cc9961394 100644 --- a/dll/win32/imagehlp/CMakeLists.txt +++ b/dll/win32/imagehlp/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D_IMAGEHLP_SOURCE_) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index f727e06d848..e3824fcc89e 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/initpki/CMakeLists.txt b/dll/win32/initpki/CMakeLists.txt index eb4c224da62..aa9c10fa58f 100644 --- a/dll/win32/initpki/CMakeLists.txt +++ b/dll/win32/initpki/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt index 9110b008e7d..14b95336617 100644 --- a/dll/win32/iphlpapi/CMakeLists.txt +++ b/dll/win32/iphlpapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/itircl/CMakeLists.txt b/dll/win32/itircl/CMakeLists.txt index 106f82645bc..8118c30998a 100644 --- a/dll/win32/itircl/CMakeLists.txt +++ b/dll/win32/itircl/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 00fd3be90d7..9205bfd3269 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-D_KERNEL32_) diff --git a/dll/win32/loadperf/CMakeLists.txt b/dll/win32/loadperf/CMakeLists.txt index 79a52dbdb3e..e4dc9859961 100644 --- a/dll/win32/loadperf/CMakeLists.txt +++ b/dll/win32/loadperf/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt index 40058e3ecf8..04410477491 100644 --- a/dll/win32/lpk/CMakeLists.txt +++ b/dll/win32/lpk/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-DLANGPACK) add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt index d8fe78d437f..73613c3fa39 100644 --- a/dll/win32/mapi32/CMakeLists.txt +++ b/dll/win32/mapi32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt index c0ac6966d54..77d850a6f97 100644 --- a/dll/win32/mciavi32/CMakeLists.txt +++ b/dll/win32/mciavi32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/mcicda/CMakeLists.txt b/dll/win32/mcicda/CMakeLists.txt index 849e219907f..7ebda7b517e 100644 --- a/dll/win32/mcicda/CMakeLists.txt +++ b/dll/win32/mcicda/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt index 11d746b7d59..009a324cf83 100644 --- a/dll/win32/mciqtz32/CMakeLists.txt +++ b/dll/win32/mciqtz32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt index 657cb598f59..749a38535cd 100644 --- a/dll/win32/mciseq/CMakeLists.txt +++ b/dll/win32/mciseq/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt index 95966451f6b..838894421db 100644 --- a/dll/win32/mciwave/CMakeLists.txt +++ b/dll/win32/mciwave/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) add_definitions(-D_DLL -D__USE_CRTIMP) diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt index 62bd50b661e..f0f6938f143 100644 --- a/dll/win32/mmdrv/CMakeLists.txt +++ b/dll/win32/mmdrv/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DNDEBUG) add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt index b51d9da7c32..85bab879ae6 100644 --- a/dll/win32/modemui/CMakeLists.txt +++ b/dll/win32/modemui/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt index a632a325894..2b341e1888a 100644 --- a/dll/win32/mpr/CMakeLists.txt +++ b/dll/win32/mpr/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) add_definitions(-D_WINE) diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt index de727007d69..986a1a7bb8c 100644 --- a/dll/win32/mprapi/CMakeLists.txt +++ b/dll/win32/mprapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt index 96a1a15ff10..a4f05417391 100644 --- a/dll/win32/msadp32.acm/CMakeLists.txt +++ b/dll/win32/msadp32.acm/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) diff --git a/dll/win32/msafd/CMakeLists.txt b/dll/win32/msafd/CMakeLists.txt index 50eaa5f30b7..a2b20f457a4 100644 --- a/dll/win32/msafd/CMakeLists.txt +++ b/dll/win32/msafd/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt index 2c4eb406fc5..e5ca94dc537 100644 --- a/dll/win32/mscms/CMakeLists.txt +++ b/dll/win32/mscms/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt index b80511ece8e..d7e0bfa5906 100644 --- a/dll/win32/mscoree/CMakeLists.txt +++ b/dll/win32/mscoree/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D__WINESRC__) diff --git a/dll/win32/msg711.acm/CMakeLists.txt b/dll/win32/msg711.acm/CMakeLists.txt index 15aaeaf0092..13186533452 100644 --- a/dll/win32/msg711.acm/CMakeLists.txt +++ b/dll/win32/msg711.acm/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt index daf50fae81c..696e621f87f 100644 --- a/dll/win32/msgina/CMakeLists.txt +++ b/dll/win32/msgina/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/msgsm32.acm/CMakeLists.txt b/dll/win32/msgsm32.acm/CMakeLists.txt index f773c457f11..07dda69f1a3 100644 --- a/dll/win32/msgsm32.acm/CMakeLists.txt +++ b/dll/win32/msgsm32.acm/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D__WINESRC__) diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt index 96e066f0ef3..00ceeafc04b 100644 --- a/dll/win32/msimg32/CMakeLists.txt +++ b/dll/win32/msimg32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/msnet32/CMakeLists.txt b/dll/win32/msnet32/CMakeLists.txt index 599d697761d..53ee2798e9b 100644 --- a/dll/win32/msnet32/CMakeLists.txt +++ b/dll/win32/msnet32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/mssign32/CMakeLists.txt b/dll/win32/mssign32/CMakeLists.txt index 738c683cd6c..90fb70ebd6f 100644 --- a/dll/win32/mssign32/CMakeLists.txt +++ b/dll/win32/mssign32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/mssip32/CMakeLists.txt b/dll/win32/mssip32/CMakeLists.txt index c193657eaf9..9c4d1d658cd 100644 --- a/dll/win32/mssip32/CMakeLists.txt +++ b/dll/win32/mssip32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index 2bee18fd8cc..a949909ac43 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUSE_MSVCRT_PREFIX) add_definitions(-D_MSVCRT_) diff --git a/dll/win32/msvcrt20/CMakeLists.txt b/dll/win32/msvcrt20/CMakeLists.txt index 73b28b69fa7..76b20f9575f 100644 --- a/dll/win32/msvcrt20/CMakeLists.txt +++ b/dll/win32/msvcrt20/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/msvcrt40/CMakeLists.txt b/dll/win32/msvcrt40/CMakeLists.txt index f2999d69713..112e64c5e6c 100644 --- a/dll/win32/msvcrt40/CMakeLists.txt +++ b/dll/win32/msvcrt40/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/msvfw32/CMakeLists.txt b/dll/win32/msvfw32/CMakeLists.txt index f5de97957ad..014f05f07da 100644 --- a/dll/win32/msvfw32/CMakeLists.txt +++ b/dll/win32/msvfw32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/msvidc32/CMakeLists.txt b/dll/win32/msvidc32/CMakeLists.txt index a6fe6fa065d..68151b8601c 100644 --- a/dll/win32/msvidc32/CMakeLists.txt +++ b/dll/win32/msvidc32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/mswsock/CMakeLists.txt b/dll/win32/mswsock/CMakeLists.txt index 86e7f5cac04..8e39116141f 100644 --- a/dll/win32/mswsock/CMakeLists.txt +++ b/dll/win32/mswsock/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/nddeapi/CMakeLists.txt b/dll/win32/nddeapi/CMakeLists.txt index 69e7ac98c1c..5fe54cf94c1 100644 --- a/dll/win32/nddeapi/CMakeLists.txt +++ b/dll/win32/nddeapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt index 871533589e6..9e3211d7c0b 100644 --- a/dll/win32/netapi32/CMakeLists.txt +++ b/dll/win32/netapi32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/newdev/CMakeLists.txt b/dll/win32/newdev/CMakeLists.txt index 21b6d95e905..7faa22770a4 100644 --- a/dll/win32/newdev/CMakeLists.txt +++ b/dll/win32/newdev/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/ntdsapi/CMakeLists.txt b/dll/win32/ntdsapi/CMakeLists.txt index 5843b3cf519..818827e26a8 100644 --- a/dll/win32/ntdsapi/CMakeLists.txt +++ b/dll/win32/ntdsapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/ntlanman/CMakeLists.txt b/dll/win32/ntlanman/CMakeLists.txt index bcab9fe120b..5a4412d7b5a 100644 --- a/dll/win32/ntlanman/CMakeLists.txt +++ b/dll/win32/ntlanman/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/ntprint/CMakeLists.txt b/dll/win32/ntprint/CMakeLists.txt index 2b0bf27e0d9..497f38bd18a 100644 --- a/dll/win32/ntprint/CMakeLists.txt +++ b/dll/win32/ntprint/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/olecli32/CMakeLists.txt b/dll/win32/olecli32/CMakeLists.txt index 5f259aeb842..ae6bf871cbd 100644 --- a/dll/win32/olecli32/CMakeLists.txt +++ b/dll/win32/olecli32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/oledlg/CMakeLists.txt b/dll/win32/oledlg/CMakeLists.txt index bcae3d29c6b..ab150ad9c59 100644 --- a/dll/win32/oledlg/CMakeLists.txt +++ b/dll/win32/oledlg/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/olesvr32/CMakeLists.txt b/dll/win32/olesvr32/CMakeLists.txt index 44acdd0f531..1b8688df71a 100644 --- a/dll/win32/olesvr32/CMakeLists.txt +++ b/dll/win32/olesvr32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/olethk32/CMakeLists.txt b/dll/win32/olethk32/CMakeLists.txt index 76e87ad31ac..df4b3de03a9 100644 --- a/dll/win32/olethk32/CMakeLists.txt +++ b/dll/win32/olethk32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/pidgen/CMakeLists.txt b/dll/win32/pidgen/CMakeLists.txt index bb69fceefe1..8b47363470f 100644 --- a/dll/win32/pidgen/CMakeLists.txt +++ b/dll/win32/pidgen/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt index 81a1f8359ba..6a565074ec3 100644 --- a/dll/win32/powrprof/CMakeLists.txt +++ b/dll/win32/powrprof/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/printui/CMakeLists.txt b/dll/win32/printui/CMakeLists.txt index 226c40246c6..0866a09d794 100644 --- a/dll/win32/printui/CMakeLists.txt +++ b/dll/win32/printui/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/query/CMakeLists.txt b/dll/win32/query/CMakeLists.txt index 78218039280..367f6953c70 100644 --- a/dll/win32/query/CMakeLists.txt +++ b/dll/win32/query/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/rasapi32/CMakeLists.txt b/dll/win32/rasapi32/CMakeLists.txt index fc2d2fa0bd1..9bef20641d4 100644 --- a/dll/win32/rasapi32/CMakeLists.txt +++ b/dll/win32/rasapi32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/rasdlg/CMakeLists.txt b/dll/win32/rasdlg/CMakeLists.txt index 17cc8aa16d3..aaf6beff198 100644 --- a/dll/win32/rasdlg/CMakeLists.txt +++ b/dll/win32/rasdlg/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + spec2def(rasdlg ${CMAKE_CURRENT_SOURCE_DIR}/rasdlg.spec ${CMAKE_CURRENT_BINARY_DIR}/rasdlg.def) diff --git a/dll/win32/rasman/CMakeLists.txt b/dll/win32/rasman/CMakeLists.txt index 84ad1707c85..5517e1ade40 100644 --- a/dll/win32/rasman/CMakeLists.txt +++ b/dll/win32/rasman/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + spec2def(rasman ${CMAKE_CURRENT_SOURCE_DIR}/rasman.spec ${CMAKE_CURRENT_BINARY_DIR}/rasman.def) diff --git a/dll/win32/resutils/CMakeLists.txt b/dll/win32/resutils/CMakeLists.txt index f70a24f30b8..11eabd7ed99 100644 --- a/dll/win32/resutils/CMakeLists.txt +++ b/dll/win32/resutils/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/samlib/CMakeLists.txt b/dll/win32/samlib/CMakeLists.txt index 443c15d0fa0..b80b4c021dd 100644 --- a/dll/win32/samlib/CMakeLists.txt +++ b/dll/win32/samlib/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/samsrv/CMakeLists.txt b/dll/win32/samsrv/CMakeLists.txt index 013878334fb..4c140122367 100644 --- a/dll/win32/samsrv/CMakeLists.txt +++ b/dll/win32/samsrv/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/sccbase/CMakeLists.txt b/dll/win32/sccbase/CMakeLists.txt index 28fdf56a568..a56188dbf72 100644 --- a/dll/win32/sccbase/CMakeLists.txt +++ b/dll/win32/sccbase/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/schannel/CMakeLists.txt b/dll/win32/schannel/CMakeLists.txt index 1f8627c9bc2..72e35141dd7 100644 --- a/dll/win32/schannel/CMakeLists.txt +++ b/dll/win32/schannel/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/sensapi/CMakeLists.txt b/dll/win32/sensapi/CMakeLists.txt index e7bf20bb9d7..403ae92d9eb 100644 --- a/dll/win32/sensapi/CMakeLists.txt +++ b/dll/win32/sensapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt index 0a2feb5a1ba..fef25a78cda 100644 --- a/dll/win32/serialui/CMakeLists.txt +++ b/dll/win32/serialui/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index c5e8fcbd6e2..7e8aec549c5 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/slbcsp/CMakeLists.txt b/dll/win32/slbcsp/CMakeLists.txt index 8237a72d4e1..bc208a7fd47 100644 --- a/dll/win32/slbcsp/CMakeLists.txt +++ b/dll/win32/slbcsp/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt index b1dd4baf48b..4e59f5a950a 100644 --- a/dll/win32/smdll/CMakeLists.txt +++ b/dll/win32/smdll/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt index 2e724c33c14..a44ceb3cb5a 100644 --- a/dll/win32/sndblst/CMakeLists.txt +++ b/dll/win32/sndblst/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) diff --git a/dll/win32/snmpapi/CMakeLists.txt b/dll/win32/snmpapi/CMakeLists.txt index 80aa5976384..43997f9ca32 100644 --- a/dll/win32/snmpapi/CMakeLists.txt +++ b/dll/win32/snmpapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/spoolss/CMakeLists.txt b/dll/win32/spoolss/CMakeLists.txt index c4ed15008c6..10d4f3810b2 100644 --- a/dll/win32/spoolss/CMakeLists.txt +++ b/dll/win32/spoolss/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/srclient/CMakeLists.txt b/dll/win32/srclient/CMakeLists.txt index 25ad1b75fd0..8bd5bd58530 100644 --- a/dll/win32/srclient/CMakeLists.txt +++ b/dll/win32/srclient/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + spec2def(srclient ${CMAKE_CURRENT_SOURCE_DIR}/srclient.spec ${CMAKE_CURRENT_BINARY_DIR}/srclient.def) diff --git a/dll/win32/sxs/CMakeLists.txt b/dll/win32/sxs/CMakeLists.txt index aa778eb486b..49cb76e3da0 100644 --- a/dll/win32/sxs/CMakeLists.txt +++ b/dll/win32/sxs/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt index c8fee7ee6f0..b93cd890f00 100644 --- a/dll/win32/t2embed/CMakeLists.txt +++ b/dll/win32/t2embed/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/tapi32/CMakeLists.txt b/dll/win32/tapi32/CMakeLists.txt index b0980ba4901..0433c573395 100644 --- a/dll/win32/tapi32/CMakeLists.txt +++ b/dll/win32/tapi32/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/traffic/CMakeLists.txt b/dll/win32/traffic/CMakeLists.txt index 1e3ba439d19..77987ed7b92 100644 --- a/dll/win32/traffic/CMakeLists.txt +++ b/dll/win32/traffic/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/updspapi/CMakeLists.txt b/dll/win32/updspapi/CMakeLists.txt index efa8946f8b4..0441a041118 100644 --- a/dll/win32/updspapi/CMakeLists.txt +++ b/dll/win32/updspapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/url/CMakeLists.txt b/dll/win32/url/CMakeLists.txt index a9ad5dbcf2a..605acd52ecc 100644 --- a/dll/win32/url/CMakeLists.txt +++ b/dll/win32/url/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/user32/CMakeLists.txt b/dll/win32/user32/CMakeLists.txt index 63e013e34cd..466437c31ef 100644 --- a/dll/win32/user32/CMakeLists.txt +++ b/dll/win32/user32/CMakeLists.txt @@ -1,5 +1,5 @@ -SET(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-DUNICODE -D_UNICODE) add_definitions(-D_DLL -D__USE_CRTIMP) diff --git a/dll/win32/user32/user32.rc b/dll/win32/user32/user32.rc index 3521e707faa..5a669279f0f 100644 --- a/dll/win32/user32/user32.rc +++ b/dll/win32/user32/user32.rc @@ -93,7 +93,7 @@ OBM_MNARROW BITMAP "resources/obm_mnarrow.bmp" #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" diff --git a/dll/win32/usp10/CMakeLists.txt b/dll/win32/usp10/CMakeLists.txt index 2eeec92cb5e..8f279e2b199 100644 --- a/dll/win32/usp10/CMakeLists.txt +++ b/dll/win32/usp10/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt index 277e141ad03..548125ddd92 100644 --- a/dll/win32/uxtheme/CMakeLists.txt +++ b/dll/win32/uxtheme/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) diff --git a/drivers/base/beep/CMakeLists.txt b/drivers/base/beep/CMakeLists.txt index 0f19b1f087a..3940886b2f9 100644 --- a/drivers/base/beep/CMakeLists.txt +++ b/drivers/base/beep/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(beep SHARED beep.c beep.rc) diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt index 7fc45ba1fb4..cce397f498b 100644 --- a/drivers/base/bootvid/CMakeLists.txt +++ b/drivers/base/bootvid/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + spec2def(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/bootvid.spec ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) diff --git a/drivers/base/kdcom/CMakeLists.txt b/drivers/base/kdcom/CMakeLists.txt index 3a6eae6ee5c..b133ccb5bb9 100644 --- a/drivers/base/kdcom/CMakeLists.txt +++ b/drivers/base/kdcom/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + spec2def(kdcom ${CMAKE_CURRENT_SOURCE_DIR}/kdcom.spec ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) diff --git a/drivers/base/kddll/CMakeLists.txt b/drivers/base/kddll/CMakeLists.txt index 1743c6c088d..c98f01b7b82 100644 --- a/drivers/base/kddll/CMakeLists.txt +++ b/drivers/base/kddll/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + spec2def(kdcom ${CMAKE_CURRENT_SOURCE_DIR}/kdcom.spec ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) diff --git a/drivers/base/nmidebug/CMakeLists.txt b/drivers/base/nmidebug/CMakeLists.txt index 8b464800b17..608de0c2b0b 100644 --- a/drivers/base/nmidebug/CMakeLists.txt +++ b/drivers/base/nmidebug/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(nmidebug SHARED nmidebug.c nmidebug.rc) diff --git a/drivers/base/null/CMakeLists.txt b/drivers/base/null/CMakeLists.txt index 124e863cde7..b99e5f81287 100644 --- a/drivers/base/null/CMakeLists.txt +++ b/drivers/base/null/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(null SHARED null.c null.rc) diff --git a/drivers/battery/battc/CMakeLists.txt b/drivers/battery/battc/CMakeLists.txt index 6c45cb1242b..51de6290ad7 100644 --- a/drivers/battery/battc/CMakeLists.txt +++ b/drivers/battery/battc/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_definitions(-D_BATTERYCLASS_) diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt index 34fae007ec3..9a1f2a96b80 100644 --- a/drivers/bus/acpi/CMakeLists.txt +++ b/drivers/bus/acpi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(include) include_directories(acpica/include) diff --git a/drivers/bus/isapnp/CMakeLists.txt b/drivers/bus/isapnp/CMakeLists.txt index f3155be310f..a9e4e08216e 100644 --- a/drivers/bus/isapnp/CMakeLists.txt +++ b/drivers/bus/isapnp/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(isapnp SHARED isapnp.c diff --git a/drivers/bus/pci/CMakeLists.txt b/drivers/bus/pci/CMakeLists.txt index b27db43d3d8..e7fa28588fc 100644 --- a/drivers/bus/pci/CMakeLists.txt +++ b/drivers/bus/pci/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(pci SHARED fdo.c diff --git a/drivers/bus/pcix/CMakeLists.txt b/drivers/bus/pcix/CMakeLists.txt index a28c7d4830a..ed7f95fba18 100644 --- a/drivers/bus/pcix/CMakeLists.txt +++ b/drivers/bus/pcix/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + list(APPEND SOURCE arb/ar_busno.c diff --git a/drivers/bus/pcmcia/CMakeLists.txt b/drivers/bus/pcmcia/CMakeLists.txt index 92267651348..845b8c2de8f 100644 --- a/drivers/bus/pcmcia/CMakeLists.txt +++ b/drivers/bus/pcmcia/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(pcmcia SHARED fdo.c diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt index 0ed1202af2d..1694974148a 100644 --- a/drivers/filesystems/cdfs/CMakeLists.txt +++ b/drivers/filesystems/cdfs/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt index 080792c2bd9..f207d642380 100644 --- a/drivers/filesystems/fastfat/CMakeLists.txt +++ b/drivers/filesystems/fastfat/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + list(APPEND SOURCE blockdev.c diff --git a/drivers/input/i8042prt/CMakeLists.txt b/drivers/input/i8042prt/CMakeLists.txt index 55a78337bf3..24b6eb3181e 100644 --- a/drivers/input/i8042prt/CMakeLists.txt +++ b/drivers/input/i8042prt/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(i8042prt SHARED createclose.c diff --git a/drivers/input/kbdclass/CMakeLists.txt b/drivers/input/kbdclass/CMakeLists.txt index 8341d32fff0..39784b7ed78 100644 --- a/drivers/input/kbdclass/CMakeLists.txt +++ b/drivers/input/kbdclass/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(kbdclass SHARED kbdclass.c diff --git a/drivers/input/mouclass/CMakeLists.txt b/drivers/input/mouclass/CMakeLists.txt index f803a001d7c..7f6e50c9bf6 100644 --- a/drivers/input/mouclass/CMakeLists.txt +++ b/drivers/input/mouclass/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(mouclass SHARED misc.c diff --git a/drivers/input/sermouse/CMakeLists.txt b/drivers/input/sermouse/CMakeLists.txt index c808304119e..208d8585246 100644 --- a/drivers/input/sermouse/CMakeLists.txt +++ b/drivers/input/sermouse/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(sermouse SHARED createclose.c diff --git a/drivers/setup/blue/CMakeLists.txt b/drivers/setup/blue/CMakeLists.txt index f11b3a68ab4..7c87c6d2216 100644 --- a/drivers/setup/blue/CMakeLists.txt +++ b/drivers/setup/blue/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt index ca7644f85bc..cfc645a4140 100644 --- a/drivers/storage/class/cdrom/CMakeLists.txt +++ b/drivers/storage/class/cdrom/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(..) diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt index f98e932edf4..85ed6c8c1f4 100644 --- a/drivers/storage/class/class2/CMakeLists.txt +++ b/drivers/storage/class/class2/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(..) diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt index b5c1df2487d..5c588c93636 100644 --- a/drivers/storage/class/disk/CMakeLists.txt +++ b/drivers/storage/class/disk/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(..) diff --git a/drivers/storage/class/ramdisk/CMakeLists.txt b/drivers/storage/class/ramdisk/CMakeLists.txt index c83072bec59..ea5bc474d15 100644 --- a/drivers/storage/class/ramdisk/CMakeLists.txt +++ b/drivers/storage/class/ramdisk/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(..) diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/CMakeLists.txt index ea65181e323..df6b951fab1 100644 --- a/drivers/storage/floppy/CMakeLists.txt +++ b/drivers/storage/floppy/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(floppy SHARED csqrtns.c diff --git a/drivers/storage/ide/atapi/CMakeLists.txt b/drivers/storage/ide/atapi/CMakeLists.txt index 4e99cbf7502..de8dec7df2a 100644 --- a/drivers/storage/ide/atapi/CMakeLists.txt +++ b/drivers/storage/ide/atapi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(atapi SHARED atapi.c atapi.rc) diff --git a/drivers/storage/port/buslogic/CMakeLists.txt b/drivers/storage/port/buslogic/CMakeLists.txt index d2b4016138c..82035709b6b 100644 --- a/drivers/storage/port/buslogic/CMakeLists.txt +++ b/drivers/storage/port/buslogic/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(buslogic SHARED BusLogic958.c BusLogic958.rc) diff --git a/drivers/storage/scsiport/CMakeLists.txt b/drivers/storage/scsiport/CMakeLists.txt index 0ca54cc6ff6..270b583b178 100644 --- a/drivers/storage/scsiport/CMakeLists.txt +++ b/drivers/storage/scsiport/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + add_library(scsiport SHARED scsiport.c stubs.c scsiport.rc) diff --git a/drivers/video/font/ftfd/CMakeLists.txt b/drivers/video/font/ftfd/CMakeLists.txt index 1f4ad6612bf..5cebe5b813d 100644 --- a/drivers/video/font/ftfd/CMakeLists.txt +++ b/drivers/video/font/ftfd/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include) diff --git a/drivers/video/videoprt/CMakeLists.txt b/drivers/video/videoprt/CMakeLists.txt index 724859c432c..85621e0567e 100644 --- a/drivers/video/videoprt/CMakeLists.txt +++ b/drivers/video/videoprt/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) diff --git a/drivers/wmi/CMakeLists.txt b/drivers/wmi/CMakeLists.txt index b1dd29712e3..3de8e48dc62 100644 --- a/drivers/wmi/CMakeLists.txt +++ b/drivers/wmi/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + spec2def(wmilib ${CMAKE_CURRENT_SOURCE_DIR}/wmilib.spec ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def) diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index d601a3527f8..85a16958d90 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -43,7 +43,7 @@ list(APPEND HAL_GENERIC_UP_SOURCE halx86/up/pic.c halx86/up/processor.c) -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + list(APPEND HAL_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/hal_hal.h.gch diff --git a/subsystems/win32/win32k/CMakeLists.txt b/subsystems/win32/win32k/CMakeLists.txt index a501fd321a8..468d74a36ff 100644 --- a/subsystems/win32/win32k/CMakeLists.txt +++ b/subsystems/win32/win32k/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") + include_directories(.) include_directories(include) -- 2.17.1