Move all temporary import libs to a single directory.
authorSylvain Petreolle <spetreolle@yahoo.fr>
Fri, 17 Sep 2010 20:27:01 +0000 (20:27 +0000)
committerSylvain Petreolle <spetreolle@yahoo.fr>
Fri, 17 Sep 2010 20:27:01 +0000 (20:27 +0000)
This allows linking to libraries with "-lfoo".

svn path=/branches/cmake-bringup/; revision=48796

102 files changed:
CMakeLists.txt
base/applications/calc/CMakeLists.txt
dll/win32/acledit/CMakeLists.txt
dll/win32/aclui/CMakeLists.txt
dll/win32/advapi32/CMakeLists.txt
dll/win32/advpack/CMakeLists.txt
dll/win32/authz/CMakeLists.txt
dll/win32/avicap32/CMakeLists.txt
dll/win32/batt/CMakeLists.txt
dll/win32/beepmidi/CMakeLists.txt
dll/win32/cards/CMakeLists.txt
dll/win32/credui/CMakeLists.txt
dll/win32/crtdll/CMakeLists.txt
dll/win32/crypt32/CMakeLists.txt
dll/win32/dbghelp/CMakeLists.txt
dll/win32/dhcpcsvc/CMakeLists.txt
dll/win32/dnsapi/CMakeLists.txt
dll/win32/faultrep/CMakeLists.txt
dll/win32/fmifs/CMakeLists.txt
dll/win32/fusion/CMakeLists.txt
dll/win32/gdi32/CMakeLists.txt
dll/win32/getuname/CMakeLists.txt
dll/win32/hid/CMakeLists.txt
dll/win32/iccvid/CMakeLists.txt
dll/win32/imaadp32.acm/CMakeLists.txt
dll/win32/imagehlp/CMakeLists.txt
dll/win32/imm32/CMakeLists.txt
dll/win32/iphlpapi/CMakeLists.txt
dll/win32/kernel32/CMakeLists.txt
dll/win32/lpk/CMakeLists.txt
dll/win32/mapi32/CMakeLists.txt
dll/win32/mciavi32/CMakeLists.txt
dll/win32/mcicda/CMakeLists.txt
dll/win32/mciqtz32/CMakeLists.txt
dll/win32/mciseq/CMakeLists.txt
dll/win32/mciwave/CMakeLists.txt
dll/win32/mmdrv/CMakeLists.txt
dll/win32/modemui/CMakeLists.txt
dll/win32/msadp32.acm/CMakeLists.txt
dll/win32/msg711.acm/CMakeLists.txt
dll/win32/msgsm32.acm/CMakeLists.txt
dll/win32/msvcrt/CMakeLists.txt
dll/win32/msvcrt20/CMakeLists.txt
dll/win32/msvcrt40/CMakeLists.txt
dll/win32/mswsock/CMakeLists.txt
dll/win32/shlwapi/CMakeLists.txt
dll/win32/smdll/CMakeLists.txt
dll/win32/sndblst/CMakeLists.txt
dll/win32/user32/CMakeLists.txt
dll/win32/usp10/CMakeLists.txt
drivers/base/beep/CMakeLists.txt
drivers/base/bootvid/CMakeLists.txt
drivers/base/kdcom/CMakeLists.txt
drivers/base/kddll/CMakeLists.txt
drivers/base/nmidebug/CMakeLists.txt
drivers/base/null/CMakeLists.txt
drivers/battery/battc/CMakeLists.txt
drivers/bus/acpi/CMakeLists.txt
drivers/bus/isapnp/CMakeLists.txt
drivers/bus/pci/CMakeLists.txt
drivers/bus/pcix/CMakeLists.txt
drivers/bus/pcmcia/CMakeLists.txt
drivers/filesystems/cdfs/CMakeLists.txt
drivers/filesystems/fastfat/CMakeLists.txt
drivers/input/i8042prt/CMakeLists.txt
drivers/input/kbdclass/CMakeLists.txt
drivers/input/mouclass/CMakeLists.txt
drivers/input/sermouse/CMakeLists.txt
drivers/setup/blue/CMakeLists.txt
drivers/storage/class/cdrom/CMakeLists.txt
drivers/storage/class/class2/CMakeLists.txt
drivers/storage/class/disk/CMakeLists.txt
drivers/storage/class/ramdisk/CMakeLists.txt
drivers/storage/floppy/CMakeLists.txt
drivers/storage/ide/uniata/CMakeLists.txt
drivers/storage/port/buslogic/CMakeLists.txt
drivers/storage/scsiport/CMakeLists.txt
drivers/video/videoprt/CMakeLists.txt
drivers/wmi/CMakeLists.txt
hal/CMakeLists.txt
importlibs/libadvapi32.a [moved from dll/win32/advapi32/libadvapi32.a with 100% similarity]
importlibs/libbootvid.a [moved from drivers/base/bootvid/libbootvid.a with 100% similarity]
importlibs/libclass2.a [moved from drivers/storage/class/class2/libclass2.a with 100% similarity]
importlibs/libdbghelp.a [moved from dll/win32/dbghelp/libdbghelp.a with 100% similarity]
importlibs/libdhcpcsvc.a [moved from dll/win32/dhcpcsvc/libdhcpcsvc.a with 100% similarity]
importlibs/libftfd.a [moved from drivers/video/font/ftfd/libftfd.a with 100% similarity]
importlibs/libgdi32.a [moved from dll/win32/gdi32/libgdi32.a with 100% similarity]
importlibs/libhal.a [moved from hal/halx86/libhal.a with 100% similarity]
importlibs/libkdcom.a [moved from drivers/base/kdcom/libkdcom.a with 100% similarity]
importlibs/libkernel32.a [moved from dll/win32/kernel32/libkernel32.a with 100% similarity]
importlibs/libmlang.a [moved from dll/win32/mlang/libmlang.a with 100% similarity]
importlibs/libmpr.a [moved from dll/win32/mpr/libmpr.a with 100% similarity]
importlibs/libmsvcrt.a [moved from dll/win32/msvcrt/libmsvcrt.a with 100% similarity]
importlibs/libntdll.a [moved from dll/ntdll/libntdll.a with 100% similarity]
importlibs/libntoskrnl.a [moved from ntoskrnl/libntoskrnl.a with 100% similarity]
importlibs/libscsiport.a [moved from drivers/storage/scsiport/libscsiport.a with 100% similarity]
importlibs/libshell32.a [moved from dll/win32/shell32/libshell32.a with 100% similarity]
importlibs/liburlmon.a [moved from dll/win32/urlmon/liburlmon.a with 100% similarity]
importlibs/libuser32.a [moved from dll/win32/user32/libuser32.a with 100% similarity]
lib/3rdparty/mingw/CMakeLists.txt
ntoskrnl/CMakeLists.txt
subsystems/win32/win32k/CMakeLists.txt

index f900d1e..9506c64 100644 (file)
@@ -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)
 
index 720baf0..7a75289 100644 (file)
@@ -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)
index 1a45ff5..2fb4ea4 100644 (file)
@@ -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)
index 10ccd09..fe12fc3 100644 (file)
@@ -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)
index 124566f..dbc3339 100644 (file)
@@ -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)
index 84e08cf..abc5c7f 100644 (file)
@@ -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)
index de97ae9..b87670e 100644 (file)
@@ -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)
index 11a056d..bd30713 100644 (file)
@@ -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)
index b627a4b..3d14dd0 100644 (file)
@@ -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)
index fbf4ee2..61ef3fa 100644 (file)
@@ -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)
index 146430f..16ea3c1 100644 (file)
@@ -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)
index b440134..bca94f9 100644 (file)
@@ -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)
index 1a84c64..1071dda 100644 (file)
@@ -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)
index 967971f..597419d 100644 (file)
@@ -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)
index b6bffd1..d50fd5e 100644 (file)
@@ -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)
index c12dcc4..377a049 100644 (file)
@@ -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)
index 044df74..860d138 100644 (file)
@@ -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)
index b2a29da..bb1ac72 100644 (file)
@@ -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)
index 7f92d46..b8c6d15 100644 (file)
@@ -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)
index 20678ea..0797068 100644 (file)
@@ -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)
index a0be800..8229e63 100644 (file)
@@ -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)
index b4d88ae..07ac4df 100644 (file)
@@ -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)
index e0b025c..3243350 100644 (file)
@@ -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)
index de58376..bb45cfc 100644 (file)
@@ -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)
index 1d7fd2c..c6ccb9e 100644 (file)
@@ -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)
index 64eb24d..fb7bf07 100644 (file)
@@ -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)
index 6334c59..f727e06 100644 (file)
@@ -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)
index 55d7269..9110b00 100644 (file)
@@ -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)
index c0697bb..00fd3be 100644 (file)
@@ -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)
index 56f3ca6..40058e3 100644 (file)
@@ -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)
index 7738eb6..d8fe78d 100644 (file)
@@ -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)
index a975f6f..c0ac696 100644 (file)
@@ -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)
index be88228..849e219 100644 (file)
@@ -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)
index 11a66a6..11d746b 100644 (file)
@@ -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)
index 9293d46..657cb59 100644 (file)
@@ -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)
index 3d031da..9596645 100644 (file)
@@ -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)
index 785be0a..62bd50b 100644 (file)
@@ -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)
index 7be32c0..b51d9da 100644 (file)
@@ -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)
index 30652f3..96a1a15 100644 (file)
@@ -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)
index ba98591..15aaeaf 100644 (file)
@@ -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)
index 36c9931..f773c45 100644 (file)
@@ -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)
index 09889c9..2bee18f 100644 (file)
@@ -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)
index b4716a9..73b28b6 100644 (file)
@@ -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)
index 0f87747..f2999d6 100644 (file)
@@ -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)
index 939d814..86e7f5c 100644 (file)
@@ -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)
index 37c1377..c5e8fcb 100644 (file)
@@ -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)
index 740ef85..b1dd4ba 100644 (file)
@@ -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)
index 09c45c5..2e724c3 100644 (file)
@@ -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)
index 45c743e..63e013e 100644 (file)
@@ -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)
index bda828f..2eeec92 100644 (file)
@@ -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)
index 5f269bc..0f19b1f 100644 (file)
@@ -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)
index ca68554..7fc45ba 100644 (file)
@@ -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)
index 0149fe1..3a6eae6 100644 (file)
@@ -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)
index f884edb..1743c6c 100644 (file)
@@ -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)
index 1cda556..8b46480 100644 (file)
@@ -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)
index 3e0b2bb..124e863 100644 (file)
@@ -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)
index 43dbb99..6c45cb1 100644 (file)
@@ -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)
index 84f4d07..34fae00 100644 (file)
@@ -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)
index a259438..f3155be 100644 (file)
@@ -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)
index 3ee739f..b27db43 100644 (file)
@@ -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)
index 02cc41f..a28c7d4 100644 (file)
@@ -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)
index 5470e8c..9226765 100644 (file)
@@ -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)
index 2c6139a..0ed1202 100644 (file)
@@ -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)
index 57b7b2e..080792c 100644 (file)
@@ -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)
index e83abbd..55a7833 100644 (file)
@@ -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)
index 2b14766..8341d32 100644 (file)
@@ -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)
index cfdd804..f803a00 100644 (file)
@@ -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)
index 24793a2..c808304 100644 (file)
@@ -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)
index 54265bd..f11b3a6 100644 (file)
@@ -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)
index 3c4377e..ca7644f 100644 (file)
@@ -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)
index 5ad2fa8..f98e932 100644 (file)
@@ -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)
index 54dcf32..b5c1df2 100644 (file)
@@ -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)
index ff75512..c83072b 100644 (file)
@@ -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)
index 3045c39..ea65181 100644 (file)
@@ -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)
index 249e40c..8478af4 100644 (file)
@@ -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)
index 1897cf6..d2b4016 100644 (file)
@@ -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)
index 63b38df..0ca54cc 100644 (file)
@@ -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)
index 653cd86..724859c 100644 (file)
@@ -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)
index 314bb03..b1dd297 100644 (file)
@@ -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)
index a413d32..d601a35 100644 (file)
@@ -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
similarity index 100%
rename from hal/halx86/libhal.a
rename to importlibs/libhal.a
similarity index 100%
rename from dll/win32/mpr/libmpr.a
rename to importlibs/libmpr.a
similarity index 100%
rename from dll/ntdll/libntdll.a
rename to importlibs/libntdll.a
index 91e1721..22e78c3 100644 (file)
@@ -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)
 
index bcbd74b..063c03e 100644 (file)
@@ -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)
 
index b9ca9ac..a501fd3 100644 (file)
@@ -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)