From: Sylvain Petreolle Date: Fri, 17 Sep 2010 20:27:01 +0000 (+0000) Subject: Move all temporary import libs to a single directory. X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~845 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=174808a463ae451696a42b1f4ab3f06d5b7c78c3 Move all temporary import libs to a single directory. This allows linking to libraries with "-lfoo". svn path=/branches/cmake-bringup/; revision=48796 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f900d1e7d3f..9506c64778f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,9 @@ export(TARGETS widl winebuild nci buildno gendib FILE ${CMAKE_BINARY_DIR}/Import else() +# Linking +link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) + # Activate support for assembly source files enable_language(ASM) diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt index 720baf07349..7a75289ccc7 100644 --- a/base/applications/calc/CMakeLists.txt +++ b/base/applications/calc/CMakeLists.txt @@ -14,11 +14,10 @@ add_executable(calc WIN32 winmain.c resource.rc) -target_link_libraries(calc mingw_wmain - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a - ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a - mingw_common +target_link_libraries(calc mingw_wmain mingw_common + -ladvapi32 + -luser32 + -lgdi32 -lmsvcrt) add_dependencies(calc psdk) diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt index 1a45ff576a0..2fb4ea4e00a 100644 --- a/dll/win32/acledit/CMakeLists.txt +++ b/dll/win32/acledit/CMakeLists.txt @@ -15,6 +15,6 @@ set_target_properties(acledit PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(acledit ${CMAKE_CURRENT_BINARY_DIR}/acledit.def - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lntdll) add_dependencies(acledit acledit_def psdk buildno_header) diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt index 10ccd093fca..fe12fc3a7ac 100644 --- a/dll/win32/aclui/CMakeLists.txt +++ b/dll/win32/aclui/CMakeLists.txt @@ -17,15 +17,15 @@ set_target_properties(aclui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(aclui ${CMAKE_CURRENT_BINARY_DIR}/aclui.def - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a - ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a + -luser32 + -lgdi32 -lcomctl32 -lole32 -loleaut32 - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + -ladvapi32 -luxtheme - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(aclui aclui_def psdk) diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index 124566feb5e..dbc33390989 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -30,8 +30,8 @@ target_link_libraries(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.def wine pseh rpcrt4 - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) add_dependencies(advapi32 svcctl_client lsa_client eventlogrpc_client version) diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt index 84e08cf361d..abc5c7fc572 100644 --- a/dll/win32/advpack/CMakeLists.txt +++ b/dll/win32/advpack/CMakeLists.txt @@ -20,6 +20,6 @@ target_link_libraries(advpack -lole32 -lsetupapi -lversion - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a) + -ladvapi32) add_dependencies(advpack advpack_def psdk) diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt index de97ae9e364..b87670e4304 100644 --- a/dll/win32/authz/CMakeLists.txt +++ b/dll/win32/authz/CMakeLists.txt @@ -16,9 +16,9 @@ set_target_properties(authz PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(authz ${CMAKE_CURRENT_BINARY_DIR}/authz.def - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -ladvapi32 + -lkernel32 + -lntdll) add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(authz authz_def psdk) diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt index 11a056d3f47..bd3071303f5 100644 --- a/dll/win32/avicap32/CMakeLists.txt +++ b/dll/win32/avicap32/CMakeLists.txt @@ -13,8 +13,8 @@ set_target_properties(avicap32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(avicap32 ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -ladvapi32 + -luser32 wine mingw_common -lversion) diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt index b627a4b72f4..3d14dd00780 100644 --- a/dll/win32/batt/CMakeLists.txt +++ b/dll/win32/batt/CMakeLists.txt @@ -13,6 +13,6 @@ set_target_properties(batt PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(batt ${CMAKE_CURRENT_BINARY_DIR}/batt.def - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a) + -lkernel32) add_dependencies(batt batt_def psdk) diff --git a/dll/win32/beepmidi/CMakeLists.txt b/dll/win32/beepmidi/CMakeLists.txt index fbf4ee2e515..61ef3fa1341 100644 --- a/dll/win32/beepmidi/CMakeLists.txt +++ b/dll/win32/beepmidi/CMakeLists.txt @@ -12,7 +12,7 @@ set_target_properties(beepmidi PROPERTIES LINK_FLAGS "-Wl,-entry,0") target_link_libraries(beepmidi ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def -lwinmm - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_dependencies(beepmidi beepmidi_def psdk) diff --git a/dll/win32/cards/CMakeLists.txt b/dll/win32/cards/CMakeLists.txt index 146430f387e..16ea3c15f45 100644 --- a/dll/win32/cards/CMakeLists.txt +++ b/dll/win32/cards/CMakeLists.txt @@ -14,7 +14,7 @@ set_target_properties(cards PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(cards ${CMAKE_CURRENT_BINARY_DIR}/cards.def - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a - ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a) + -luser32 + -lgdi32) add_dependencies(cards cards_def psdk) diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt index b440134a334..bca94f98a9d 100644 --- a/dll/win32/credui/CMakeLists.txt +++ b/dll/win32/credui/CMakeLists.txt @@ -15,8 +15,8 @@ target_link_libraries(credui ${CMAKE_CURRENT_BINARY_DIR}/credui.def wine mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -ladvapi32 + -luser32 -lcomctl32) add_dependencies(credui credui_def psdk) diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt index 1a84c648d2b..1071ddacdd7 100644 --- a/dll/win32/crtdll/CMakeLists.txt +++ b/dll/win32/crtdll/CMakeLists.txt @@ -25,8 +25,8 @@ target_link_libraries(crtdll ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def wine crt - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(crtdll crtdll_def psdk) diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt index 967971f5b13..597419d3c33 100644 --- a/dll/win32/crypt32/CMakeLists.txt +++ b/dll/win32/crypt32/CMakeLists.txt @@ -48,8 +48,8 @@ target_link_libraries(crypt32 wine pseh mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -luser32 + -ladvapi32 + -lmsvcrt) add_dependencies(crypt32 crypt32_def psdk) diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt index b6bffd12671..d50fd5eecc3 100644 --- a/dll/win32/dbghelp/CMakeLists.txt +++ b/dll/win32/dbghelp/CMakeLists.txt @@ -51,6 +51,6 @@ target_link_libraries(dbghelp -lpsapi -lversion pseh - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -lmsvcrt) add_dependencies(dbghelp dbghelp_def psdk) diff --git a/dll/win32/dhcpcsvc/CMakeLists.txt b/dll/win32/dhcpcsvc/CMakeLists.txt index c12dcc46ddb..377a0496027 100644 --- a/dll/win32/dhcpcsvc/CMakeLists.txt +++ b/dll/win32/dhcpcsvc/CMakeLists.txt @@ -29,13 +29,13 @@ set_target_properties(dhcpcsvc PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(dhcpcsvc ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a + -lmsvcrt -lws2_32 -liphlpapi - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + -ladvapi32 oldnames - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE}) add_dependencies(dhcpcsvc dhcpcsvc_def psdk) diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt index 044df743267..860d1382419 100644 --- a/dll/win32/dnsapi/CMakeLists.txt +++ b/dll/win32/dnsapi/CMakeLists.txt @@ -29,12 +29,12 @@ set_target_properties(dnsapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") target_link_libraries(dnsapi ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def adns - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -luser32 -lws2_32 - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a + -lmsvcrt -liphlpapi - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) add_dependencies(dnsapi dnsapi_def psdk) diff --git a/dll/win32/faultrep/CMakeLists.txt b/dll/win32/faultrep/CMakeLists.txt index b2a29da185e..bb1ac72c79f 100644 --- a/dll/win32/faultrep/CMakeLists.txt +++ b/dll/win32/faultrep/CMakeLists.txt @@ -15,6 +15,6 @@ target_link_libraries(faultrep ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def wine mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a) + -ladvapi32) add_dependencies(faultrep faultrep_def psdk) diff --git a/dll/win32/fmifs/CMakeLists.txt b/dll/win32/fmifs/CMakeLists.txt index 7f92d460ec8..b8c6d15e344 100644 --- a/dll/win32/fmifs/CMakeLists.txt +++ b/dll/win32/fmifs/CMakeLists.txt @@ -20,8 +20,8 @@ set_target_properties(fmifs PROPERTIES LINK_FLAGS "-Wl,-entry,_InitializeFmIfs@1 target_link_libraries(fmifs ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_pch(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(fmifs fmifs_def psdk) diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt index 20678ea83c3..07970685f54 100644 --- a/dll/win32/fusion/CMakeLists.txt +++ b/dll/win32/fusion/CMakeLists.txt @@ -22,8 +22,8 @@ target_link_libraries(fusion wine mingw_common -lshlwapi - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a - ${REACTOS_SOURCE_DIR}/dll/win32/dbghelp/libdbghelp.a - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a) + -ladvapi32 + -ldbghelp + -luser32) add_dependencies(fusion fusion_def psdk) diff --git a/dll/win32/gdi32/CMakeLists.txt b/dll/win32/gdi32/CMakeLists.txt index a0be8001c58..8229e6305e9 100644 --- a/dll/win32/gdi32/CMakeLists.txt +++ b/dll/win32/gdi32/CMakeLists.txt @@ -18,13 +18,13 @@ set_target_properties(gdi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/gdi32.def - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + -luser32 + -ladvapi32 win32ksys dxguid pseh - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) add_dependencies(gdi32 psdk) diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt index b4d88ae2516..07ac4dfba09 100644 --- a/dll/win32/getuname/CMakeLists.txt +++ b/dll/win32/getuname/CMakeLists.txt @@ -13,7 +13,7 @@ set_target_properties(getuname PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(getuname ${CMAKE_CURRENT_BINARY_DIR}/getuname.def - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_dependencies(getuname getuname_def psdk) diff --git a/dll/win32/hid/CMakeLists.txt b/dll/win32/hid/CMakeLists.txt index e0b025c01e4..3243350a77d 100644 --- a/dll/win32/hid/CMakeLists.txt +++ b/dll/win32/hid/CMakeLists.txt @@ -15,8 +15,8 @@ set_target_properties(hid PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(hid ${CMAKE_CURRENT_BINARY_DIR}/hid.def - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(hid hid_def psdk) diff --git a/dll/win32/iccvid/CMakeLists.txt b/dll/win32/iccvid/CMakeLists.txt index de58376d741..bb45cfc8706 100644 --- a/dll/win32/iccvid/CMakeLists.txt +++ b/dll/win32/iccvid/CMakeLists.txt @@ -14,7 +14,7 @@ set_target_properties(iccvid PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(iccvid ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def wine - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -luser32 mingw_common) add_dependencies(iccvid iccvid_def psdk) diff --git a/dll/win32/imaadp32.acm/CMakeLists.txt b/dll/win32/imaadp32.acm/CMakeLists.txt index 1d7fd2c44ca..c6ccb9ee1a9 100644 --- a/dll/win32/imaadp32.acm/CMakeLists.txt +++ b/dll/win32/imaadp32.acm/CMakeLists.txt @@ -22,8 +22,8 @@ target_link_libraries(imaadp32.acm ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def wine -lwinmm - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -luser32 mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -lmsvcrt) add_dependencies(imaadp32.acm imaadp32.acm_def psdk) diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt index 64eb24d2b7c..fb7bf07f2ec 100644 --- a/dll/win32/imagehlp/CMakeLists.txt +++ b/dll/win32/imagehlp/CMakeLists.txt @@ -24,9 +24,9 @@ set_target_properties(imagehlp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(imagehlp ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def wine - ${REACTOS_SOURCE_DIR}/dll/win32/dbghelp/libdbghelp.a + -ldbghelp mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -lmsvcrt) add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(imagehlp imagehlp_def psdk) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index 6334c590ef1..f727e06d848 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -17,8 +17,8 @@ set_target_properties(imm32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(imm32 ${CMAKE_CURRENT_BINARY_DIR}/imm32.def wine - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -ladvapi32 + -luser32 mingw_common) add_dependencies(imm32 imm32_def psdk) diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt index 55d7269b4f5..9110b008e7d 100644 --- a/dll/win32/iphlpapi/CMakeLists.txt +++ b/dll/win32/iphlpapi/CMakeLists.txt @@ -27,10 +27,10 @@ target_link_libraries(iphlpapi ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def wine tdilib - ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/libdhcpcsvc.a - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + -ldhcpcsvc + -ladvapi32 -lws2_32 mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -lmsvcrt) add_dependencies(iphlpapi iphlpapi_def psdk) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index c0697bbb120..00fd3be90d7 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -107,7 +107,7 @@ set_target_properties(kernel32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def pseh - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) add_dependencies(kernel32 errcodes version) diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt index 56f3ca6b257..40058e3ecf8 100644 --- a/dll/win32/lpk/CMakeLists.txt +++ b/dll/win32/lpk/CMakeLists.txt @@ -14,9 +14,9 @@ set_target_properties(lpk PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(lpk ${CMAKE_CURRENT_BINARY_DIR}/lpk.def - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -luser32 -lusp10 - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_dependencies(lpk lpk_def psdk) diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt index 7738eb6fbe6..d8fe78d437f 100644 --- a/dll/win32/mapi32/CMakeLists.txt +++ b/dll/win32/mapi32/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(mapi32 -lshell32 -luuid mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a) + -luser32 + -ladvapi32) add_dependencies(mapi32 mapi32_def psdk) diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt index a975f6f78c3..c0ac6966d54 100644 --- a/dll/win32/mciavi32/CMakeLists.txt +++ b/dll/win32/mciavi32/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(mciavi32 -lmsvfw32 -lwinmm mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a - ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a) + -luser32 + -lgdi32) add_dependencies(mciavi32 mciavi32_def psdk) diff --git a/dll/win32/mcicda/CMakeLists.txt b/dll/win32/mcicda/CMakeLists.txt index be882288e03..849e219907f 100644 --- a/dll/win32/mcicda/CMakeLists.txt +++ b/dll/win32/mcicda/CMakeLists.txt @@ -16,6 +16,6 @@ target_link_libraries(mcicda wine -lwinmm mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a) + -luser32) add_dependencies(mcicda mcicda_def psdk) diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt index 11a66a61d4a..11d746b7d59 100644 --- a/dll/win32/mciqtz32/CMakeLists.txt +++ b/dll/win32/mciqtz32/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries(mciqtz32 -lole32 strmiids mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a - ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a) + -luser32 + -lgdi32) add_dependencies(mciqtz32 mciqtz32_def psdk) diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt index 9293d46dbef..657cb598f59 100644 --- a/dll/win32/mciseq/CMakeLists.txt +++ b/dll/win32/mciseq/CMakeLists.txt @@ -16,6 +16,6 @@ target_link_libraries(mciseq wine -lwinmm mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a) + -luser32) add_dependencies(mciseq mciseq_def psdk) diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt index 3d031da11a2..95966451f6b 100644 --- a/dll/win32/mciwave/CMakeLists.txt +++ b/dll/win32/mciwave/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries(mciwave wine -lwinmm mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -luser32 + -lmsvcrt) add_dependencies(mciwave mciwave_def psdk) diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt index 785be0ae5d3..62bd50b661e 100644 --- a/dll/win32/mmdrv/CMakeLists.txt +++ b/dll/win32/mmdrv/CMakeLists.txt @@ -20,7 +20,7 @@ set_target_properties(mmdrv PROPERTIES LINK_FLAGS "-Wl,-entry,0") target_link_libraries(mmdrv ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def -lwinmm - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a) + -luser32 + -lkernel32) add_dependencies(mmdrv mmdrv_def psdk) diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt index 7be32c0629b..b51d9da7c32 100644 --- a/dll/win32/modemui/CMakeLists.txt +++ b/dll/win32/modemui/CMakeLists.txt @@ -11,6 +11,6 @@ set_target_properties(modemui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(modemui ${CMAKE_CURRENT_BINARY_DIR}/modemui.def - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a) + -lkernel32) add_dependencies(modemui modemui_def psdk) diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt index 30652f374a7..96a1a15ff10 100644 --- a/dll/win32/msadp32.acm/CMakeLists.txt +++ b/dll/win32/msadp32.acm/CMakeLists.txt @@ -21,8 +21,8 @@ target_link_libraries(msadp32.acm ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def wine -lwinmm - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -luser32 mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -lmsvcrt) add_dependencies(msadp32.acm msadp32.acm_def psdk) diff --git a/dll/win32/msg711.acm/CMakeLists.txt b/dll/win32/msg711.acm/CMakeLists.txt index ba985914aca..15aaeaf0092 100644 --- a/dll/win32/msg711.acm/CMakeLists.txt +++ b/dll/win32/msg711.acm/CMakeLists.txt @@ -21,8 +21,8 @@ target_link_libraries(msg711.acm ${CMAKE_CURRENT_BINARY_DIR}/msg711.acm.def wine -lwinmm - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -luser32 mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -lmsvcrt) add_dependencies(msg711.acm msg711.acm_def psdk) diff --git a/dll/win32/msgsm32.acm/CMakeLists.txt b/dll/win32/msgsm32.acm/CMakeLists.txt index 36c9931dc95..f773c457f11 100644 --- a/dll/win32/msgsm32.acm/CMakeLists.txt +++ b/dll/win32/msgsm32.acm/CMakeLists.txt @@ -21,8 +21,8 @@ target_link_libraries(msgsm32.acm ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.acm.def wine -lwinmm - ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -luser32 mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -lmsvcrt) add_dependencies(msgsm32.acm msgsm32.acm_def psdk) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index 09889c9c206..2bee18fd8cc 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -25,8 +25,8 @@ target_link_libraries(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/msvcrt.def crt wine pseh - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_pch(msvcrt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(msvcrt psdk) diff --git a/dll/win32/msvcrt20/CMakeLists.txt b/dll/win32/msvcrt20/CMakeLists.txt index b4716a954fd..73b28b69fa7 100644 --- a/dll/win32/msvcrt20/CMakeLists.txt +++ b/dll/win32/msvcrt20/CMakeLists.txt @@ -16,6 +16,6 @@ target_link_libraries(msvcrt20 ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def wine mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -lmsvcrt) add_dependencies(msvcrt20 msvcrt20_def psdk) diff --git a/dll/win32/msvcrt40/CMakeLists.txt b/dll/win32/msvcrt40/CMakeLists.txt index 0f877476605..f2999d69713 100644 --- a/dll/win32/msvcrt40/CMakeLists.txt +++ b/dll/win32/msvcrt40/CMakeLists.txt @@ -16,6 +16,6 @@ target_link_libraries(msvcrt40 ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def wine mingw_common - ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + -lmsvcrt) add_dependencies(msvcrt40 msvcrt40_def psdk) diff --git a/dll/win32/mswsock/CMakeLists.txt b/dll/win32/mswsock/CMakeLists.txt index 939d8142ada..86e7f5cac04 100644 --- a/dll/win32/mswsock/CMakeLists.txt +++ b/dll/win32/mswsock/CMakeLists.txt @@ -18,6 +18,6 @@ set_target_properties(mswsock PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(mswsock ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def -lws2_32 - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a) + -lkernel32) add_dependencies(mswsock mswsock_def psdk) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index 37c13770582..c5e8fcbd6e2 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -40,10 +40,10 @@ target_link_libraries(shlwapi -lole32 -lcomctl32 -lcomdlg32 - ${REACTOS_SOURCE_DIR}/dll/win32/mpr/libmpr.a - ${REACTOS_SOURCE_DIR}/dll/win32/mlang/libmlang.a - ${REACTOS_SOURCE_DIR}/dll/win32/urlmon/liburlmon.a - ${REACTOS_SOURCE_DIR}/dll/win32/shell32/libshell32.a + -lmpr + -lmlang + -lurlmon + -lshell32 -lwinmm -lversion mingw_common) diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt index 740ef85f824..b1dd4baf48b 100644 --- a/dll/win32/smdll/CMakeLists.txt +++ b/dll/win32/smdll/CMakeLists.txt @@ -13,6 +13,6 @@ add_library(smdll SHARED target_link_libraries(smdll ${CMAKE_CURRENT_BINARY_DIR}/smdll.def smlib - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lntdll) add_dependencies(smdll smdll_def psdk) diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt index 09c45c524a2..2e724c33c14 100644 --- a/dll/win32/sndblst/CMakeLists.txt +++ b/dll/win32/sndblst/CMakeLists.txt @@ -20,6 +20,6 @@ target_link_libraries(sndblst -lwinmm -ladvapi32 -lkernel32 - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lntdll) add_dependencies(sndblst sndblst_def psdk) diff --git a/dll/win32/user32/CMakeLists.txt b/dll/win32/user32/CMakeLists.txt index 45c743e6f27..63e013e34cd 100644 --- a/dll/win32/user32/CMakeLists.txt +++ b/dll/win32/user32/CMakeLists.txt @@ -33,13 +33,13 @@ set_target_properties(user32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(user32 ${CMAKE_CURRENT_SOURCE_DIR}/user32.def wine - ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a - ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + -lgdi32 + -ladvapi32 -limm32 win32ksys pseh - ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a - ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + -lkernel32 + -lntdll) add_pch(user32 ${CMAKE_CURRENT_SOURCE_DIR}/include/user32.h ${SOURCE}) add_dependencies(user32 psdk) diff --git a/dll/win32/usp10/CMakeLists.txt b/dll/win32/usp10/CMakeLists.txt index bda828f015a..2eeec92cb5e 100644 --- a/dll/win32/usp10/CMakeLists.txt +++ b/dll/win32/usp10/CMakeLists.txt @@ -19,7 +19,7 @@ set_target_properties(usp10 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") target_link_libraries(usp10 ${CMAKE_CURRENT_BINARY_DIR}/usp10.def wine - ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a + -lgdi32 mingw_common) add_dependencies(usp10 usp10_def psdk) diff --git a/drivers/base/beep/CMakeLists.txt b/drivers/base/beep/CMakeLists.txt index 5f269bcbe1d..0f19b1f087a 100644 --- a/drivers/base/beep/CMakeLists.txt +++ b/drivers/base/beep/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(beep SHARED beep.c beep.rc) set_target_properties(beep PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") target_link_libraries(beep - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(beep psdk bugcodes) diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt index ca68554b6ee..7fc45ba1fb4 100644 --- a/drivers/base/bootvid/CMakeLists.txt +++ b/drivers/base/bootvid/CMakeLists.txt @@ -22,8 +22,8 @@ set_target_properties(bootvid PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-ba target_link_libraries(bootvid ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_pch(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(bootvid bootvid_def psdk buildno_header bugcodes) diff --git a/drivers/base/kdcom/CMakeLists.txt b/drivers/base/kdcom/CMakeLists.txt index 0149fe11f93..3a6eae6ee5c 100644 --- a/drivers/base/kdcom/CMakeLists.txt +++ b/drivers/base/kdcom/CMakeLists.txt @@ -17,7 +17,7 @@ set_target_properties(kdcom PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base target_link_libraries(kdcom ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(kdcom kdcom_def psdk buildno_header bugcodes) diff --git a/drivers/base/kddll/CMakeLists.txt b/drivers/base/kddll/CMakeLists.txt index f884edb9454..1743c6c088d 100644 --- a/drivers/base/kddll/CMakeLists.txt +++ b/drivers/base/kddll/CMakeLists.txt @@ -12,7 +12,7 @@ set_target_properties(kdcom PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base target_link_libraries(kdcom ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(kdcom kdcom_def psdk buildno_header bugcodes) diff --git a/drivers/base/nmidebug/CMakeLists.txt b/drivers/base/nmidebug/CMakeLists.txt index 1cda5566088..8b464800b17 100644 --- a/drivers/base/nmidebug/CMakeLists.txt +++ b/drivers/base/nmidebug/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(nmidebug SHARED nmidebug.c nmidebug.rc) set_target_properties(nmidebug PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") target_link_libraries(nmidebug - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(nmidebug psdk bugcodes) diff --git a/drivers/base/null/CMakeLists.txt b/drivers/base/null/CMakeLists.txt index 3e0b2bbc1b3..124e863cde7 100644 --- a/drivers/base/null/CMakeLists.txt +++ b/drivers/base/null/CMakeLists.txt @@ -7,7 +7,7 @@ set_target_properties(null PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl, target_link_libraries(null pseh - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(null psdk bugcodes) diff --git a/drivers/battery/battc/CMakeLists.txt b/drivers/battery/battc/CMakeLists.txt index 43dbb99cf3c..6c45cb1242b 100644 --- a/drivers/battery/battc/CMakeLists.txt +++ b/drivers/battery/battc/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(battc SHARED battc.c battc.rc) set_target_properties(battc PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(battc - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(battc psdk bugcodes) diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt index 84f4d07ec23..34fae007ec3 100644 --- a/drivers/bus/acpi/CMakeLists.txt +++ b/drivers/bus/acpi/CMakeLists.txt @@ -144,7 +144,7 @@ set_target_properties(acpi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl, target_link_libraries(acpi wdmguid acpica - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(acpi psdk bugcodes) diff --git a/drivers/bus/isapnp/CMakeLists.txt b/drivers/bus/isapnp/CMakeLists.txt index a2594389236..f3155be310f 100644 --- a/drivers/bus/isapnp/CMakeLists.txt +++ b/drivers/bus/isapnp/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(isapnp SHARED set_target_properties(isapnp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(isapnp - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(isapnp psdk bugcodes) diff --git a/drivers/bus/pci/CMakeLists.txt b/drivers/bus/pci/CMakeLists.txt index 3ee739f6c31..b27db43d3d8 100644 --- a/drivers/bus/pci/CMakeLists.txt +++ b/drivers/bus/pci/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(pci SHARED set_target_properties(pci PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(pci - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(pci psdk bugcodes buildno_header) diff --git a/drivers/bus/pcix/CMakeLists.txt b/drivers/bus/pcix/CMakeLists.txt index 02cc41fe16b..a28c7d4830a 100644 --- a/drivers/bus/pcix/CMakeLists.txt +++ b/drivers/bus/pcix/CMakeLists.txt @@ -43,8 +43,8 @@ add_library(pcix SHARED ${CMAKE_CURRENT_BINARY_DIR}/pcix_pci.h.gch ${SOURCE}) set_target_properties(pcix PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(pcix - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_pch(pcix ${CMAKE_CURRENT_SOURCE_DIR}/pci.h ${SOURCE}) add_dependencies(pcix pcix_def psdk pciclass) diff --git a/drivers/bus/pcmcia/CMakeLists.txt b/drivers/bus/pcmcia/CMakeLists.txt index 5470e8c98b8..92267651348 100644 --- a/drivers/bus/pcmcia/CMakeLists.txt +++ b/drivers/bus/pcmcia/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(pcmcia SHARED set_target_properties(pcmcia PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(pcmcia - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(pcmcia psdk bugcodes buildno_header) diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt index 2c6139a07de..0ed1202af2d 100644 --- a/drivers/filesystems/cdfs/CMakeLists.txt +++ b/drivers/filesystems/cdfs/CMakeLists.txt @@ -23,8 +23,8 @@ add_library(cdfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/cdfs_cdfs.h.gch ${SOURCE}) set_target_properties(cdfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(cdfs - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_pch(cdfs ${CMAKE_CURRENT_SOURCE_DIR}/cdfs.h ${SOURCE}) add_dependencies(cdfs psdk bugcodes) diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt index 57b7b2ea4fe..080792c2bd9 100644 --- a/drivers/filesystems/fastfat/CMakeLists.txt +++ b/drivers/filesystems/fastfat/CMakeLists.txt @@ -29,8 +29,8 @@ add_library(fastfat SHARED ${CMAKE_CURRENT_BINARY_DIR}/fastfat_vfat.h.gch ${SOUR set_target_properties(fastfat PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(fastfat - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_pch(fastfat ${CMAKE_CURRENT_SOURCE_DIR}/vfat.h ${SOURCE}) add_dependencies(fastfat psdk bugcodes) diff --git a/drivers/input/i8042prt/CMakeLists.txt b/drivers/input/i8042prt/CMakeLists.txt index e83abbdc9ee..55a78337bf3 100644 --- a/drivers/input/i8042prt/CMakeLists.txt +++ b/drivers/input/i8042prt/CMakeLists.txt @@ -17,7 +17,7 @@ add_library(i8042prt SHARED set_target_properties(i8042prt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") target_link_libraries(i8042prt - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(i8042prt psdk bugcodes) diff --git a/drivers/input/kbdclass/CMakeLists.txt b/drivers/input/kbdclass/CMakeLists.txt index 2b14766b037..8341d32fff0 100644 --- a/drivers/input/kbdclass/CMakeLists.txt +++ b/drivers/input/kbdclass/CMakeLists.txt @@ -11,7 +11,7 @@ set_target_properties(kbdclass PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 target_link_libraries(kbdclass pseh - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(kbdclass psdk bugcodes) diff --git a/drivers/input/mouclass/CMakeLists.txt b/drivers/input/mouclass/CMakeLists.txt index cfdd8047d7c..f803a001d7c 100644 --- a/drivers/input/mouclass/CMakeLists.txt +++ b/drivers/input/mouclass/CMakeLists.txt @@ -10,7 +10,7 @@ set_target_properties(mouclass PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 target_link_libraries(mouclass pseh - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(mouclass psdk bugcodes) diff --git a/drivers/input/sermouse/CMakeLists.txt b/drivers/input/sermouse/CMakeLists.txt index 24793a2c50a..c808304119e 100644 --- a/drivers/input/sermouse/CMakeLists.txt +++ b/drivers/input/sermouse/CMakeLists.txt @@ -14,7 +14,7 @@ add_library(sermouse SHARED set_target_properties(sermouse PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") target_link_libraries(sermouse - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(sermouse psdk bugcodes) diff --git a/drivers/setup/blue/CMakeLists.txt b/drivers/setup/blue/CMakeLists.txt index 54265bd518d..f11b3a68ab4 100644 --- a/drivers/setup/blue/CMakeLists.txt +++ b/drivers/setup/blue/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(blue SHARED blue.c font.c blue.rc) set_target_properties(blue PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(blue - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(blue psdk bugcodes) diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt index 3c4377e2f90..ca7644f85bc 100644 --- a/drivers/storage/class/cdrom/CMakeLists.txt +++ b/drivers/storage/class/cdrom/CMakeLists.txt @@ -8,9 +8,9 @@ add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc) set_target_properties(cdrom PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(cdrom - ${REACTOS_SOURCE_DIR}/drivers/storage/class/class2/libclass2.a - ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lclass2 + -lscsiport + -lntoskrnl + -lhal) add_dependencies(cdrom psdk bugcodes) diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt index 5ad2fa8cdb9..f98e932edf4 100644 --- a/drivers/storage/class/class2/CMakeLists.txt +++ b/drivers/storage/class/class2/CMakeLists.txt @@ -11,8 +11,8 @@ set_target_properties(class2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -W target_link_libraries(class2 ${CMAKE_CURRENT_BINARY_DIR}/class2.def - ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lscsiport + -lntoskrnl + -lhal) add_dependencies(class2 class2_def psdk bugcodes) diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt index 54dcf320698..b5c1df2487d 100644 --- a/drivers/storage/class/disk/CMakeLists.txt +++ b/drivers/storage/class/disk/CMakeLists.txt @@ -8,9 +8,9 @@ add_library(disk SHARED disk.c disk.rc) set_target_properties(disk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(disk - ${REACTOS_SOURCE_DIR}/drivers/storage/class/class2/libclass2.a - ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lclass2 + -lscsiport + -lntoskrnl + -lhal) add_dependencies(disk psdk bugcodes) diff --git a/drivers/storage/class/ramdisk/CMakeLists.txt b/drivers/storage/class/ramdisk/CMakeLists.txt index ff7551205be..c83072bec59 100644 --- a/drivers/storage/class/ramdisk/CMakeLists.txt +++ b/drivers/storage/class/ramdisk/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(ramdisk SHARED ramdisk.c ramdisk.rc) set_target_properties(ramdisk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(ramdisk - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(ramdisk psdk bugcodes) diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/CMakeLists.txt index 3045c3999bb..ea65181e323 100644 --- a/drivers/storage/floppy/CMakeLists.txt +++ b/drivers/storage/floppy/CMakeLists.txt @@ -13,7 +13,7 @@ set_target_properties(floppy PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -W target_link_libraries(floppy csq - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(floppy psdk bugcodes buildno_header) diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt index 249e40c471a..8478af4399f 100644 --- a/drivers/storage/ide/uniata/CMakeLists.txt +++ b/drivers/storage/ide/uniata/CMakeLists.txt @@ -17,9 +17,9 @@ add_library(uniata SHARED set_target_properties(uniata PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(uniata - ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a + -lscsiport + -lntoskrnl + -lhal -lgcc) add_dependencies(uniata psdk bugcodes buildno_header) diff --git a/drivers/storage/port/buslogic/CMakeLists.txt b/drivers/storage/port/buslogic/CMakeLists.txt index 1897cf657a0..d2b4016138c 100644 --- a/drivers/storage/port/buslogic/CMakeLists.txt +++ b/drivers/storage/port/buslogic/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(buslogic SHARED BusLogic958.c BusLogic958.rc) set_target_properties(buslogic PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") target_link_libraries(buslogic - ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a + -lscsiport libcntpr) add_dependencies(buslogic psdk bugcodes) diff --git a/drivers/storage/scsiport/CMakeLists.txt b/drivers/storage/scsiport/CMakeLists.txt index 63b38df040d..0ca54cc6ff6 100644 --- a/drivers/storage/scsiport/CMakeLists.txt +++ b/drivers/storage/scsiport/CMakeLists.txt @@ -7,7 +7,7 @@ set_target_properties(scsiport PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 target_link_libraries(scsiport ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_dependencies(scsiport psdk bugcodes) diff --git a/drivers/video/videoprt/CMakeLists.txt b/drivers/video/videoprt/CMakeLists.txt index 653cd86ea55..724859c432c 100644 --- a/drivers/video/videoprt/CMakeLists.txt +++ b/drivers/video/videoprt/CMakeLists.txt @@ -30,8 +30,8 @@ set_target_properties(videoprt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 target_link_libraries(videoprt ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + -lntoskrnl + -lhal) add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) add_dependencies(videoprt videoprt_def psdk bugcodes buildno_header) diff --git a/drivers/wmi/CMakeLists.txt b/drivers/wmi/CMakeLists.txt index 314bb037255..b1dd29712e3 100644 --- a/drivers/wmi/CMakeLists.txt +++ b/drivers/wmi/CMakeLists.txt @@ -9,6 +9,6 @@ set_target_properties(wmilib PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-bas target_link_libraries(wmilib ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a) + -lntoskrnl) add_dependencies(wmilib wmilib_def psdk buildno_header bugcodes) diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index a413d321d8d..d601a3527f8 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -61,7 +61,7 @@ set_target_properties(hal PROPERTIES LINK_FLAGS "-Wl,-entry,_HalInitSystem@8 -Wl target_link_libraries(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + -lntoskrnl libcntpr) list(APPEND MINI_HAL_SOURCE diff --git a/dll/win32/advapi32/libadvapi32.a b/importlibs/libadvapi32.a similarity index 100% rename from dll/win32/advapi32/libadvapi32.a rename to importlibs/libadvapi32.a diff --git a/drivers/base/bootvid/libbootvid.a b/importlibs/libbootvid.a similarity index 100% rename from drivers/base/bootvid/libbootvid.a rename to importlibs/libbootvid.a diff --git a/drivers/storage/class/class2/libclass2.a b/importlibs/libclass2.a similarity index 100% rename from drivers/storage/class/class2/libclass2.a rename to importlibs/libclass2.a diff --git a/dll/win32/dbghelp/libdbghelp.a b/importlibs/libdbghelp.a similarity index 100% rename from dll/win32/dbghelp/libdbghelp.a rename to importlibs/libdbghelp.a diff --git a/dll/win32/dhcpcsvc/libdhcpcsvc.a b/importlibs/libdhcpcsvc.a similarity index 100% rename from dll/win32/dhcpcsvc/libdhcpcsvc.a rename to importlibs/libdhcpcsvc.a diff --git a/drivers/video/font/ftfd/libftfd.a b/importlibs/libftfd.a similarity index 100% rename from drivers/video/font/ftfd/libftfd.a rename to importlibs/libftfd.a diff --git a/dll/win32/gdi32/libgdi32.a b/importlibs/libgdi32.a similarity index 100% rename from dll/win32/gdi32/libgdi32.a rename to importlibs/libgdi32.a diff --git a/hal/halx86/libhal.a b/importlibs/libhal.a similarity index 100% rename from hal/halx86/libhal.a rename to importlibs/libhal.a diff --git a/drivers/base/kdcom/libkdcom.a b/importlibs/libkdcom.a similarity index 100% rename from drivers/base/kdcom/libkdcom.a rename to importlibs/libkdcom.a diff --git a/dll/win32/kernel32/libkernel32.a b/importlibs/libkernel32.a similarity index 100% rename from dll/win32/kernel32/libkernel32.a rename to importlibs/libkernel32.a diff --git a/dll/win32/mlang/libmlang.a b/importlibs/libmlang.a similarity index 100% rename from dll/win32/mlang/libmlang.a rename to importlibs/libmlang.a diff --git a/dll/win32/mpr/libmpr.a b/importlibs/libmpr.a similarity index 100% rename from dll/win32/mpr/libmpr.a rename to importlibs/libmpr.a diff --git a/dll/win32/msvcrt/libmsvcrt.a b/importlibs/libmsvcrt.a similarity index 100% rename from dll/win32/msvcrt/libmsvcrt.a rename to importlibs/libmsvcrt.a diff --git a/dll/ntdll/libntdll.a b/importlibs/libntdll.a similarity index 100% rename from dll/ntdll/libntdll.a rename to importlibs/libntdll.a diff --git a/ntoskrnl/libntoskrnl.a b/importlibs/libntoskrnl.a similarity index 100% rename from ntoskrnl/libntoskrnl.a rename to importlibs/libntoskrnl.a diff --git a/drivers/storage/scsiport/libscsiport.a b/importlibs/libscsiport.a similarity index 100% rename from drivers/storage/scsiport/libscsiport.a rename to importlibs/libscsiport.a diff --git a/dll/win32/shell32/libshell32.a b/importlibs/libshell32.a similarity index 100% rename from dll/win32/shell32/libshell32.a rename to importlibs/libshell32.a diff --git a/dll/win32/urlmon/liburlmon.a b/importlibs/liburlmon.a similarity index 100% rename from dll/win32/urlmon/liburlmon.a rename to importlibs/liburlmon.a diff --git a/dll/win32/user32/libuser32.a b/importlibs/libuser32.a similarity index 100% rename from dll/win32/user32/libuser32.a rename to importlibs/libuser32.a diff --git a/lib/3rdparty/mingw/CMakeLists.txt b/lib/3rdparty/mingw/CMakeLists.txt index 91e1721b27e..22e78c36953 100644 --- a/lib/3rdparty/mingw/CMakeLists.txt +++ b/lib/3rdparty/mingw/CMakeLists.txt @@ -35,7 +35,7 @@ set(MINGW_COMMON_SOURCE ) add_library(mingw_common ${MINGW_COMMON_SOURCE}) -target_link_libraries(mingw_common oldnames ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) +target_link_libraries(mingw_common oldnames -lkernel32 -lntdll) set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) add_dependencies(mingw_common psdk) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index bcbd74b5f1b..063c03e0da0 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -411,14 +411,14 @@ set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartu target_link_libraries(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_i386.def csq - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a + -lhal pseh cmlib rtl rossym libcntpr - ${REACTOS_SOURCE_DIR}/drivers/base/kdcom/libkdcom.a - ${REACTOS_SOURCE_DIR}/drivers/base/bootvid/libbootvid.a + -lkdcom + -lbootvid wdmguid ioevent) diff --git a/subsystems/win32/win32k/CMakeLists.txt b/subsystems/win32/win32k/CMakeLists.txt index b9ca9acbca4..a501fd321a8 100644 --- a/subsystems/win32/win32k/CMakeLists.txt +++ b/subsystems/win32/win32k/CMakeLists.txt @@ -180,9 +180,9 @@ set_target_properties(win32k PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -W target_link_libraries(win32k ${CMAKE_CURRENT_SOURCE_DIR}/win32k_i386.def pseh - ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a - ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a - ${REACTOS_SOURCE_DIR}/drivers/video/font/ftfd/libftfd.a + -lntoskrnl + -lhal + -lftfd dxguid libcntpr)