diff --git a/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild b/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
index c84b3edc5aa..bf0ef3bb216 100644
--- a/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
+++ b/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild
@@ -1,7 +1,7 @@
-
+
.
0x0500
0x0600
@@ -11,5 +11,4 @@
comctl32
kbsdll.c
kbsdll.rc
- kbsdll.spec
diff --git a/reactos/base/applications/regedit/clb/clb.rbuild b/reactos/base/applications/regedit/clb/clb.rbuild
index 2e8d86aa7fb..f7086619344 100644
--- a/reactos/base/applications/regedit/clb/clb.rbuild
+++ b/reactos/base/applications/regedit/clb/clb.rbuild
@@ -1,7 +1,7 @@
-
+
.
0x0500
0x0600
@@ -13,6 +13,5 @@
comctl32
clb.c
clb.rc
- clb.spec
precomp.h
diff --git a/reactos/base/applications/screensavers/3dtext/3dtext.rbuild b/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
index 03e2f504a12..365f917ef88 100644
--- a/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
+++ b/reactos/base/applications/screensavers/3dtext/3dtext.rbuild
@@ -1,7 +1,7 @@
-
+
scrnsave
kernel32
user32
@@ -13,7 +13,6 @@
3dtext.c
settings.c
rsrc.rc
- 3dtext.spec
diff --git a/reactos/base/applications/screensavers/logon/logon.rbuild b/reactos/base/applications/screensavers/logon/logon.rbuild
index 32085fbd859..6176f166a94 100644
--- a/reactos/base/applications/screensavers/logon/logon.rbuild
+++ b/reactos/base/applications/screensavers/logon/logon.rbuild
@@ -1,7 +1,7 @@
-
+
.
scrnsave
kernel32
@@ -12,5 +12,4 @@
logon.c
logon.rc
- logon.spec
diff --git a/reactos/dll/cpl/access/access.rbuild b/reactos/dll/cpl/access/access.rbuild
index 825eef4914b..2a900952614 100644
--- a/reactos/dll/cpl/access/access.rbuild
+++ b/reactos/dll/cpl/access/access.rbuild
@@ -1,7 +1,7 @@
-
+
.
0x600
0x600
@@ -18,5 +18,4 @@
mouse.c
sound.c
access.rc
- access.spec
diff --git a/reactos/dll/cpl/console/console.rbuild b/reactos/dll/cpl/console/console.rbuild
index 7fce9201d08..7531fb381d8 100644
--- a/reactos/dll/cpl/console/console.rbuild
+++ b/reactos/dll/cpl/console/console.rbuild
@@ -1,5 +1,5 @@
-
+
.
0x600
0x501
@@ -13,6 +13,5 @@
layout.c
colors.c
console.rc
- console.spec
console.h
diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
index 628c1012c15..65a4ad19db7 100644
--- a/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
+++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
@@ -1,7 +1,7 @@
-
+
.
0x600
0x501
@@ -9,5 +9,4 @@
kernel32
hdwwiz.c
hdwwiz.rc
- hdwwiz.spec
diff --git a/reactos/dll/cpl/mmsys/mmsys.rbuild b/reactos/dll/cpl/mmsys/mmsys.rbuild
index 80d234d1332..4a6ffc38ef2 100644
--- a/reactos/dll/cpl/mmsys/mmsys.rbuild
+++ b/reactos/dll/cpl/mmsys/mmsys.rbuild
@@ -1,7 +1,7 @@
-
+
.
0x600
0x501
@@ -21,5 +21,4 @@
audio.c
voice.c
mmsys.rc
- mmsys.spec
diff --git a/reactos/dll/directx/d3d9/d3d9.rbuild b/reactos/dll/directx/d3d9/d3d9.rbuild
index 61369d65d50..6d273c7e415 100644
--- a/reactos/dll/directx/d3d9/d3d9.rbuild
+++ b/reactos/dll/directx/d3d9/d3d9.rbuild
@@ -1,7 +1,7 @@
-
+
advapi32
kernel32
@@ -31,5 +31,4 @@
device.c
format.c
d3d9.rc
- d3d9.spec
diff --git a/reactos/dll/directx/devenum/devenum.rbuild b/reactos/dll/directx/devenum/devenum.rbuild
index 98166aa5e19..85536a2934f 100644
--- a/reactos/dll/directx/devenum/devenum.rbuild
+++ b/reactos/dll/directx/devenum/devenum.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
0x600
@@ -25,5 +25,4 @@
factory.c
mediacatenum.c
parsedisplayname.c
- devenum.spec
diff --git a/reactos/dll/directx/dinput/dinput.rbuild b/reactos/dll/directx/dinput/dinput.rbuild
index 9ec004c3048..9d363d5c64d 100644
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
0x600
@@ -27,5 +27,4 @@
keyboard.c
mouse.c
regsvr.c
- dinput.spec
diff --git a/reactos/dll/directx/dinput8/dinput8.rbuild b/reactos/dll/directx/dinput8/dinput8.rbuild
index 539b9273ccc..6f10621ecda 100644
--- a/reactos/dll/directx/dinput8/dinput8.rbuild
+++ b/reactos/dll/directx/dinput8/dinput8.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
0x600
@@ -20,5 +20,4 @@
dinput
version.rc
dinput8_main.c
- dinput8.spec
diff --git a/reactos/dll/directx/dplay/dplay.rbuild b/reactos/dll/directx/dplay/dplay.rbuild
index 81144bac274..337fa3925bc 100644
--- a/reactos/dll/directx/dplay/dplay.rbuild
+++ b/reactos/dll/directx/dplay/dplay.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
0x600
@@ -19,5 +19,4 @@
dinput
version.rc
dplay_main.c
- dplay.spec
diff --git a/reactos/dll/directx/dplayx/dplayx.rbuild b/reactos/dll/directx/dplayx/dplayx.rbuild
index fb4bde9eff9..be389321d33 100644
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
0x600
@@ -28,5 +28,4 @@
lobbysp.c
name_server.c
regsvr.c
- dplayx.spec
diff --git a/reactos/dll/directx/dsound/dsound.rbuild b/reactos/dll/directx/dsound/dsound.rbuild
index 3053ec1308c..6486281a0bc 100644
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
0x600
@@ -35,5 +35,4 @@
dxroslayer.c
getguidfromstring.c
- dsound.spec
diff --git a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
index df69d270643..1155eba1a42 100644
--- a/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
+++ b/reactos/dll/directx/dxdiagn/dxdiagn.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
0x600
@@ -22,5 +22,4 @@
dxdiag_main.c
provider.c
regsvr.c
- dxdiagn.spec
diff --git a/reactos/dll/directx/ksproxy/ksproxy.rbuild b/reactos/dll/directx/ksproxy/ksproxy.rbuild
index fddad2c54ea..d5b065e6509 100644
--- a/reactos/dll/directx/ksproxy/ksproxy.rbuild
+++ b/reactos/dll/directx/ksproxy/ksproxy.rbuild
@@ -2,7 +2,7 @@
-
+
.
0x600
0x600
@@ -11,6 +11,5 @@
ntdll
ksproxy.c
ksproxy.rc
- ksproxy.spec
diff --git a/reactos/dll/directx/msdmo/msdmo.rbuild b/reactos/dll/directx/msdmo/msdmo.rbuild
index 57670d04ac3..a74951d3260 100644
--- a/reactos/dll/directx/msdmo/msdmo.rbuild
+++ b/reactos/dll/directx/msdmo/msdmo.rbuild
@@ -2,7 +2,7 @@
-
+
.
0x600
0x600
diff --git a/reactos/dll/directx/qedit/qedit.rbuild b/reactos/dll/directx/qedit/qedit.rbuild
index 6f2363b2051..30d54b21cf1 100644
--- a/reactos/dll/directx/qedit/qedit.rbuild
+++ b/reactos/dll/directx/qedit/qedit.rbuild
@@ -2,7 +2,7 @@
-
+
.
0x600
0x600
@@ -11,6 +11,5 @@
ntdll
qedit.c
qedit.rc
- qedit.spec
diff --git a/reactos/dll/directx/quartz/quartz.rbuild b/reactos/dll/directx/quartz/quartz.rbuild
index 831eef5b9c4..a482805d839 100644
--- a/reactos/dll/directx/quartz/quartz.rbuild
+++ b/reactos/dll/directx/quartz/quartz.rbuild
@@ -3,7 +3,7 @@
-
+
.
0x600
0x600
diff --git a/reactos/dll/directx/wine/d3d8/d3d8.rbuild b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
index 65c823288c0..fb8183949c2 100644
--- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
0x600
@@ -37,5 +37,4 @@
volume.c
volumetexture.c
version.rc
- d3d8.spec
diff --git a/reactos/dll/directx/wine/d3d9/d3d9.rbuild b/reactos/dll/directx/wine/d3d9/d3d9.rbuild
index e6a43e34ea7..5c333aafcb1 100644
--- a/reactos/dll/directx/wine/d3d9/d3d9.rbuild
+++ b/reactos/dll/directx/wine/d3d9/d3d9.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
0x600
diff --git a/reactos/dll/keyboard/kbda1/kbda1.rbuild b/reactos/dll/keyboard/kbda1/kbda1.rbuild
index f4535a84a1d..0786e9f0786 100644
--- a/reactos/dll/keyboard/kbda1/kbda1.rbuild
+++ b/reactos/dll/keyboard/kbda1/kbda1.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbda1.c
kbda1.rc
- kbda1.spec
diff --git a/reactos/dll/keyboard/kbda2/kbda2.rbuild b/reactos/dll/keyboard/kbda2/kbda2.rbuild
index 13c311dae83..b173ed16c22 100644
--- a/reactos/dll/keyboard/kbda2/kbda2.rbuild
+++ b/reactos/dll/keyboard/kbda2/kbda2.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbda2.c
kbda2.rc
- kbda2.spec
diff --git a/reactos/dll/keyboard/kbda3/kbda3.rbuild b/reactos/dll/keyboard/kbda3/kbda3.rbuild
index b3d213c52aa..6082e66c83e 100644
--- a/reactos/dll/keyboard/kbda3/kbda3.rbuild
+++ b/reactos/dll/keyboard/kbda3/kbda3.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbda3.c
kbda3.rc
- kbda3.spec
diff --git a/reactos/dll/keyboard/kbdal/kbdal.rbuild b/reactos/dll/keyboard/kbdal/kbdal.rbuild
index e45eb3d8862..bac4abe3cfb 100644
--- a/reactos/dll/keyboard/kbdal/kbdal.rbuild
+++ b/reactos/dll/keyboard/kbdal/kbdal.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdal.c
kbdal.rc
- kbdal.spec
diff --git a/reactos/dll/keyboard/kbdarme/kbdarme.rbuild b/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
index 008efd44374..fd7bdd86f0a 100644
--- a/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
+++ b/reactos/dll/keyboard/kbdarme/kbdarme.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdarme.c
kbdarme.rc
- kbdarme.spec
diff --git a/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild b/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
index 37383830f23..56df98d708f 100644
--- a/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
+++ b/reactos/dll/keyboard/kbdarmw/kbdarmw.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdarmw.c
kbdarmw.rc
- kbdarmw.spec
diff --git a/reactos/dll/keyboard/kbdaze/kbdaze.rbuild b/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
index fdeeb8af0e0..52baa9e3012 100644
--- a/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
+++ b/reactos/dll/keyboard/kbdaze/kbdaze.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdaze.c
kbdaze.rc
- kbdaze.spec
diff --git a/reactos/dll/keyboard/kbdazel/kbdazel.rbuild b/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
index 3011162513c..f97e3440706 100644
--- a/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
+++ b/reactos/dll/keyboard/kbdazel/kbdazel.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdazel.c
kbdazel.rc
- kbdazel.spec
diff --git a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
index d17d60ce6ca..efca0ec41da 100644
--- a/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
+++ b/reactos/dll/keyboard/kbdbe/kbdbe.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdbe.c
kbdbe.rc
- kbdbe.spec
diff --git a/reactos/dll/keyboard/kbdbga/kbdbga.rbuild b/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
index 70aabd09dd2..5a1c4cb64a9 100644
--- a/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
+++ b/reactos/dll/keyboard/kbdbga/kbdbga.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdbga.c
kbdbga.rc
- kbdbga.spec
diff --git a/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild b/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
index 1bad67104e9..c6ea382c38c 100644
--- a/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
+++ b/reactos/dll/keyboard/kbdbgm/kbdbgm.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdbgm.c
kbdbgm.rc
- kbdbgm.spec
diff --git a/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild b/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
index 43d911488c9..e89c17c7f03 100644
--- a/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
+++ b/reactos/dll/keyboard/kbdbgt/kbdbgt.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdbgt.c
kbdbgt.rc
- kbdbgt.spec
diff --git a/reactos/dll/keyboard/kbdblr/kbdblr.rbuild b/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
index 51303bb3408..a912d5aca07 100644
--- a/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
+++ b/reactos/dll/keyboard/kbdblr/kbdblr.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdblr.c
kbdblr.rc
- kbdblr.spec
diff --git a/reactos/dll/keyboard/kbdbr/kbdbr.rbuild b/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
index e0a2d6d7bb2..87a8230a8ce 100644
--- a/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
+++ b/reactos/dll/keyboard/kbdbr/kbdbr.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdbr.c
kbdbr.rc
- kbdbr.spec
diff --git a/reactos/dll/keyboard/kbdbur/kbdbur.rbuild b/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
index 81efd760fcb..c92f791f3fb 100644
--- a/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
+++ b/reactos/dll/keyboard/kbdbur/kbdbur.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdbur.c
kbdbur.rc
- kbdbur.spec
diff --git a/reactos/dll/keyboard/kbdcan/kbdcan.rbuild b/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
index 9857e8f2f3b..0646e3142fd 100644
--- a/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
+++ b/reactos/dll/keyboard/kbdcan/kbdcan.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdcan.c
kbdcan.rc
- kbdcan.spec
diff --git a/reactos/dll/keyboard/kbdcr/kbdcr.rbuild b/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
index f709a9eb03c..5c157079f9a 100644
--- a/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
+++ b/reactos/dll/keyboard/kbdcr/kbdcr.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdcr.c
kbdcr.rc
- kbdcr.spec
diff --git a/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild b/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
index c9d22a60f84..378e7f5507c 100644
--- a/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
+++ b/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdcz1.c
kbdcz1.rc
- kbdcz1.spec
diff --git a/reactos/dll/keyboard/kbdda/kbdda.rbuild b/reactos/dll/keyboard/kbdda/kbdda.rbuild
index b3582afa281..6e87af1f15c 100644
--- a/reactos/dll/keyboard/kbdda/kbdda.rbuild
+++ b/reactos/dll/keyboard/kbdda/kbdda.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdda.c
kbdda.rc
- kbdda.spec
diff --git a/reactos/dll/keyboard/kbddv/kbddv.rbuild b/reactos/dll/keyboard/kbddv/kbddv.rbuild
index 89a765ca6a0..5705ccc8853 100644
--- a/reactos/dll/keyboard/kbddv/kbddv.rbuild
+++ b/reactos/dll/keyboard/kbddv/kbddv.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbddv.c
kbddv.rc
- kbddv.spec
diff --git a/reactos/dll/keyboard/kbdes/kbdes.rbuild b/reactos/dll/keyboard/kbdes/kbdes.rbuild
index 45cfdf8cd34..9f760d13c47 100644
--- a/reactos/dll/keyboard/kbdes/kbdes.rbuild
+++ b/reactos/dll/keyboard/kbdes/kbdes.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdes.c
kbdes.rc
- kbdes.spec
diff --git a/reactos/dll/keyboard/kbdest/kbdest.rbuild b/reactos/dll/keyboard/kbdest/kbdest.rbuild
index 39c3b196b6b..ce719a5e7df 100644
--- a/reactos/dll/keyboard/kbdest/kbdest.rbuild
+++ b/reactos/dll/keyboard/kbdest/kbdest.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdest.c
kbdest.rc
- kbdest.spec
diff --git a/reactos/dll/keyboard/kbdfc/kbdfc.rbuild b/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
index 7d20ce4c4b1..1bf5206b146 100644
--- a/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
+++ b/reactos/dll/keyboard/kbdfc/kbdfc.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdfc.c
kbdfc.rc
- kbdfc.spec
diff --git a/reactos/dll/keyboard/kbdfi/kbdfi.rbuild b/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
index 8def34916a1..847f5e72fd3 100644
--- a/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
+++ b/reactos/dll/keyboard/kbdfi/kbdfi.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdfi.c
kbdfi.rc
- kbdfi.spec
diff --git a/reactos/dll/keyboard/kbdfr/kbdfr.rbuild b/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
index 3b9251409c1..dd364bf3084 100644
--- a/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
+++ b/reactos/dll/keyboard/kbdfr/kbdfr.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdfr.c
kbdfr.rc
- kbdfr.spec
diff --git a/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild b/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
index cf930f80c1b..dc0e32d67a1 100644
--- a/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
+++ b/reactos/dll/keyboard/kbdgeo/kbdgeo.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdgeo.c
kbdgeo.rc
- kbdgeo.spec
diff --git a/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild b/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
index 5f282da5e46..4ac2eab4389 100644
--- a/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
+++ b/reactos/dll/keyboard/kbdgerg/kbdgerg.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdgerg.c
kbdgerg.rc
- kbdgerg.spec
diff --git a/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild b/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
index 44403a40538..724ae2f1da8 100644
--- a/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
+++ b/reactos/dll/keyboard/kbdgneo/kbdgneo.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdgneo.c
kbdgneo.rc
- kbdgneo.spec
diff --git a/reactos/dll/keyboard/kbdgr/kbdgr.rbuild b/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
index d992f6ec3e7..99d000934e0 100644
--- a/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
+++ b/reactos/dll/keyboard/kbdgr/kbdgr.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdgr.c
kbdgr.rc
- kbdgr.spec
diff --git a/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild b/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
index 5f228231848..f3391e13738 100644
--- a/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
+++ b/reactos/dll/keyboard/kbdgrist/kbdgrist.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdgrist.c
kbdgrist.rc
- kbdgrist.spec
diff --git a/reactos/dll/keyboard/kbdhe/kbdhe.rbuild b/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
index 8dfa25cde1f..6bcb456c8af 100644
--- a/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
+++ b/reactos/dll/keyboard/kbdhe/kbdhe.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdhe.c
kbdhe.rc
- kbdhe.spec
diff --git a/reactos/dll/keyboard/kbdheb/kbdheb.rbuild b/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
index f163665fc92..a4c522b72e8 100644
--- a/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
+++ b/reactos/dll/keyboard/kbdheb/kbdheb.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdheb.c
kbdheb.rc
- kbdheb.spec
diff --git a/reactos/dll/keyboard/kbdhu/kbdhu.rbuild b/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
index 33d5a8ae5fa..037c29b5325 100644
--- a/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
+++ b/reactos/dll/keyboard/kbdhu/kbdhu.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdhu.c
kbdhu.rc
- kbdhu.spec
diff --git a/reactos/dll/keyboard/kbdic/kbdic.rbuild b/reactos/dll/keyboard/kbdic/kbdic.rbuild
index ca14176da38..765fe5473bf 100644
--- a/reactos/dll/keyboard/kbdic/kbdic.rbuild
+++ b/reactos/dll/keyboard/kbdic/kbdic.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdic.c
kbdic.rc
- kbdic.spec
diff --git a/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild b/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
index eb093ceb3e8..62d0874588f 100644
--- a/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
+++ b/reactos/dll/keyboard/kbdinasa/kbdinasa.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdinasa.c
kbdinasa.rc
- kbdinasa.spec
diff --git a/reactos/dll/keyboard/kbdinben/kbdinben.rbuild b/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
index 418fbe7e0ae..3114edcbc65 100644
--- a/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
+++ b/reactos/dll/keyboard/kbdinben/kbdinben.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdinben.c
kbdinben.rc
- kbdinben.spec
diff --git a/reactos/dll/keyboard/kbdindev/kbdindev.rbuild b/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
index 67c41f377f3..a413b9fea5e 100644
--- a/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
+++ b/reactos/dll/keyboard/kbdindev/kbdindev.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdindev.c
kbdindev.rc
- kbdindev.spec
diff --git a/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild b/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
index aca7a777e64..ceb9e680381 100644
--- a/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
+++ b/reactos/dll/keyboard/kbdinguj/kbdinguj.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdinguj.c
kbdinguj.rc
- kbdinguj.spec
diff --git a/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild b/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
index 4d4f50b79fb..f18261ae53d 100644
--- a/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
+++ b/reactos/dll/keyboard/kbdinmal/kbdinmal.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdinmal.c
kbdinmal.rc
- kbdinmal.spec
diff --git a/reactos/dll/keyboard/kbdir/kbdir.rbuild b/reactos/dll/keyboard/kbdir/kbdir.rbuild
index 4d35719d649..98bf4f0ed04 100644
--- a/reactos/dll/keyboard/kbdir/kbdir.rbuild
+++ b/reactos/dll/keyboard/kbdir/kbdir.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdir.c
kbdir.rc
- kbdir.spec
diff --git a/reactos/dll/keyboard/kbdit/kbdit.rbuild b/reactos/dll/keyboard/kbdit/kbdit.rbuild
index eeca81895ee..eedfc129454 100644
--- a/reactos/dll/keyboard/kbdit/kbdit.rbuild
+++ b/reactos/dll/keyboard/kbdit/kbdit.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdit.c
kbdit.rc
- kbdit.spec
diff --git a/reactos/dll/keyboard/kbdja/kbdja.rbuild b/reactos/dll/keyboard/kbdja/kbdja.rbuild
index 3453ab78d76..1ab11a9d104 100644
--- a/reactos/dll/keyboard/kbdja/kbdja.rbuild
+++ b/reactos/dll/keyboard/kbdja/kbdja.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdja.c
kbdja.rc
- kbdja.spec
diff --git a/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild b/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
index 646a0738040..9e1754efa2b 100644
--- a/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
+++ b/reactos/dll/keyboard/kbdkaz/kbdkaz.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdkaz.c
kbdkaz.rc
- kbdkaz.spec
diff --git a/reactos/dll/keyboard/kbdko/kbdko.rbuild b/reactos/dll/keyboard/kbdko/kbdko.rbuild
index f6ad227e060..952be1f2718 100644
--- a/reactos/dll/keyboard/kbdko/kbdko.rbuild
+++ b/reactos/dll/keyboard/kbdko/kbdko.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdko.c
kbdko.rc
- kbdko.spec
diff --git a/reactos/dll/keyboard/kbdla/kbdla.rbuild b/reactos/dll/keyboard/kbdla/kbdla.rbuild
index f6eff54f57c..80a223ae50c 100644
--- a/reactos/dll/keyboard/kbdla/kbdla.rbuild
+++ b/reactos/dll/keyboard/kbdla/kbdla.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdla.c
kbdla.rc
- kbdla.spec
diff --git a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
index 682e2fcb547..7bf85785bff 100644
--- a/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
+++ b/reactos/dll/keyboard/kbdlt/kbdlt.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdlt.c
kbdlt.rc
- kbdlt.spec
diff --git a/reactos/dll/keyboard/kbdlv/kbdlv.rbuild b/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
index 9d099e8dc9f..779582a315c 100644
--- a/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
+++ b/reactos/dll/keyboard/kbdlv/kbdlv.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdlv.c
kbdlv.rc
- kbdlv.spec
diff --git a/reactos/dll/keyboard/kbdmac/kbdmac.rbuild b/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
index ed855b1ed3c..dde788de457 100644
--- a/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
+++ b/reactos/dll/keyboard/kbdmac/kbdmac.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdmac.c
kbdmac.rc
- kbdmac.spec
diff --git a/reactos/dll/keyboard/kbdne/kbdne.rbuild b/reactos/dll/keyboard/kbdne/kbdne.rbuild
index 926c5b01d61..448491cddab 100644
--- a/reactos/dll/keyboard/kbdne/kbdne.rbuild
+++ b/reactos/dll/keyboard/kbdne/kbdne.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdne.c
kbdne.rc
- kbdne.spec
diff --git a/reactos/dll/keyboard/kbdno/kbdno.rbuild b/reactos/dll/keyboard/kbdno/kbdno.rbuild
index 8c53f1afb43..65696b4402d 100644
--- a/reactos/dll/keyboard/kbdno/kbdno.rbuild
+++ b/reactos/dll/keyboard/kbdno/kbdno.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdno.c
kbdno.rc
- kbdno.spec
diff --git a/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild b/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
index c67bec16713..a39be73c83a 100644
--- a/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
+++ b/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdpl1.c
kbdpl1.rc
- kbdpl1.spec
diff --git a/reactos/dll/keyboard/kbdpo/kbdpo.rbuild b/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
index 2610aff858f..f5dc73a3d4f 100644
--- a/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
+++ b/reactos/dll/keyboard/kbdpo/kbdpo.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdpo.c
kbdpo.rc
- kbdpo.spec
diff --git a/reactos/dll/keyboard/kbdro/kbdro.rbuild b/reactos/dll/keyboard/kbdro/kbdro.rbuild
index 15fee3807ef..84f2718c80d 100644
--- a/reactos/dll/keyboard/kbdro/kbdro.rbuild
+++ b/reactos/dll/keyboard/kbdro/kbdro.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdro.c
kbdro.rc
- kbdro.spec
diff --git a/reactos/dll/keyboard/kbdru/kbdru.rbuild b/reactos/dll/keyboard/kbdru/kbdru.rbuild
index 7d84ce5d932..a446920cf37 100644
--- a/reactos/dll/keyboard/kbdru/kbdru.rbuild
+++ b/reactos/dll/keyboard/kbdru/kbdru.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdru.c
kbdru.rc
- kbdru.spec
diff --git a/reactos/dll/keyboard/kbdru1/kbdru1.rbuild b/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
index 104e57ba165..fe413e17238 100644
--- a/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
+++ b/reactos/dll/keyboard/kbdru1/kbdru1.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdru1.c
kbdru1.rc
- kbdru1.spec
diff --git a/reactos/dll/keyboard/kbdsg/kbdsg.rbuild b/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
index dfb5dcabe71..0a883c31bf5 100644
--- a/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
+++ b/reactos/dll/keyboard/kbdsg/kbdsg.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdsg.c
kbdsg.rc
- kbdsg.spec
diff --git a/reactos/dll/keyboard/kbdsk/kbdsk.rbuild b/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
index db0938767a2..e2ee24e52a1 100644
--- a/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
+++ b/reactos/dll/keyboard/kbdsk/kbdsk.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdsk.c
kbdsk.rc
- kbdsk.spec
diff --git a/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild b/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
index e639566fd9c..7f15ccddcb4 100644
--- a/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
+++ b/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdsk1.c
kbdsk1.rc
- kbdsk1.spec
diff --git a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
index 70733e95c0a..32cf47df585 100644
--- a/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
+++ b/reactos/dll/keyboard/kbdsw/kbdsw.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdsw.c
kbdsw.rc
- kbdsw.spec
diff --git a/reactos/dll/keyboard/kbdtat/kbdtat.rbuild b/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
index b158a4bed4d..ddffed3fad0 100644
--- a/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
+++ b/reactos/dll/keyboard/kbdtat/kbdtat.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdtat.c
kbdtat.rc
- kbdtat.spec
diff --git a/reactos/dll/keyboard/kbdth0/kbdth0.rbuild b/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
index 57dac75db54..2083fbf53b1 100644
--- a/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
+++ b/reactos/dll/keyboard/kbdth0/kbdth0.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdth0.c
kbdth0.rc
- kbdth0.spec
diff --git a/reactos/dll/keyboard/kbdth1/kbdth1.rbuild b/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
index 918ccaef910..ff027cf46cb 100644
--- a/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
+++ b/reactos/dll/keyboard/kbdth1/kbdth1.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdth1.c
kbdth1.rc
- kbdth1.spec
diff --git a/reactos/dll/keyboard/kbdth2/kbdth2.rbuild b/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
index 23028cde79c..986a062abec 100644
--- a/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
+++ b/reactos/dll/keyboard/kbdth2/kbdth2.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdth2.c
kbdth2.rc
- kbdth2.spec
diff --git a/reactos/dll/keyboard/kbdth3/kbdth3.rbuild b/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
index 8d4599d7fbf..9cd3614ce5f 100644
--- a/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
+++ b/reactos/dll/keyboard/kbdth3/kbdth3.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdth3.c
kbdth3.rc
- kbdth3.spec
diff --git a/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild b/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
index 5b0064c6adf..ba720c1f13f 100644
--- a/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
+++ b/reactos/dll/keyboard/kbdtuf/kbdtuf.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdtuf.c
kbdtuf.rc
- kbdtuf.spec
diff --git a/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild b/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
index 1cc516fcce8..501ef71db18 100644
--- a/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
+++ b/reactos/dll/keyboard/kbdtuq/kbdtuq.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdtuq.c
kbdtuq.rc
- kbdtuq.spec
diff --git a/reactos/dll/keyboard/kbduk/kbduk.rbuild b/reactos/dll/keyboard/kbduk/kbduk.rbuild
index 50cc9b84b18..a0eadb44a6f 100644
--- a/reactos/dll/keyboard/kbduk/kbduk.rbuild
+++ b/reactos/dll/keyboard/kbduk/kbduk.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbduk.c
kbduk.rc
- kbduk.spec
diff --git a/reactos/dll/keyboard/kbdur/kbdur.rbuild b/reactos/dll/keyboard/kbdur/kbdur.rbuild
index c38ab572c03..bc4e4a39dee 100644
--- a/reactos/dll/keyboard/kbdur/kbdur.rbuild
+++ b/reactos/dll/keyboard/kbdur/kbdur.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdur.c
kbdur.rc
- kbdur.spec
diff --git a/reactos/dll/keyboard/kbdurs/kbdurs.rbuild b/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
index 91c94bdb1ef..069e3ee707e 100644
--- a/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
+++ b/reactos/dll/keyboard/kbdurs/kbdurs.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdurs.c
kbdurs.rc
- kbdurs.spec
diff --git a/reactos/dll/keyboard/kbdus/kbdus.rbuild b/reactos/dll/keyboard/kbdus/kbdus.rbuild
index 42c7ca0e090..adb0126939c 100644
--- a/reactos/dll/keyboard/kbdus/kbdus.rbuild
+++ b/reactos/dll/keyboard/kbdus/kbdus.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdus.c
kbdus.rc
- kbdus.spec
diff --git a/reactos/dll/keyboard/kbdusa/kbdusa.rbuild b/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
index c9dc1b90799..b3b451427c4 100644
--- a/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
+++ b/reactos/dll/keyboard/kbdusa/kbdusa.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdusa.c
kbdusa.rc
- kbdusa.spec
diff --git a/reactos/dll/keyboard/kbdusl/kbdusl.rbuild b/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
index 80de56da78a..a93f20d8e1d 100644
--- a/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
+++ b/reactos/dll/keyboard/kbdusl/kbdusl.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdusl.c
kbdusl.rc
- kbdusl.spec
diff --git a/reactos/dll/keyboard/kbdusr/kbdusr.rbuild b/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
index 3fa2412a282..68a04241eaa 100644
--- a/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
+++ b/reactos/dll/keyboard/kbdusr/kbdusr.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdusr.c
kbdusr.rc
- kbdusr.spec
diff --git a/reactos/dll/keyboard/kbdusx/kbdusx.rbuild b/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
index c2eb6e9bece..e6e5df680d9 100644
--- a/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
+++ b/reactos/dll/keyboard/kbdusx/kbdusx.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdusx.c
kbdusx.rc
- kbdusx.spec
diff --git a/reactos/dll/keyboard/kbduzb/kbduzb.rbuild b/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
index cf995a05315..da804ac5ec9 100644
--- a/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
+++ b/reactos/dll/keyboard/kbduzb/kbduzb.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbduzb.c
kbduzb.rc
- kbduzb.spec
diff --git a/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild b/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
index 472e3f9ce11..b3b07712b88 100644
--- a/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
+++ b/reactos/dll/keyboard/kbdvntc/kbdvntc.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdvntc.c
kbdvntc.rc
- kbdvntc.spec
diff --git a/reactos/dll/keyboard/kbdycc/kbdycc.rbuild b/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
index bc81aa50ea5..18eba58c332 100644
--- a/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
+++ b/reactos/dll/keyboard/kbdycc/kbdycc.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdycc.c
kbdycc.rc
- kbdycc.spec
diff --git a/reactos/dll/keyboard/kbdycl/kbdycl.rbuild b/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
index 4da9d79adb4..eff20bb5603 100644
--- a/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
+++ b/reactos/dll/keyboard/kbdycl/kbdycl.rbuild
@@ -1,11 +1,10 @@
-
+
include
0x0500
kbdycl.c
kbdycl.rc
- kbdycl.spec
diff --git a/reactos/dll/shellext/deskadp/deskadp.rbuild b/reactos/dll/shellext/deskadp/deskadp.rbuild
index 7a3d3c23c30..30e5a44129d 100644
--- a/reactos/dll/shellext/deskadp/deskadp.rbuild
+++ b/reactos/dll/shellext/deskadp/deskadp.rbuild
@@ -1,5 +1,5 @@
-
+
.
0x0500
0x0600
@@ -15,6 +15,5 @@
deskadp.c
shxiface.c
deskadp.rc
- deskadp.spec
precomp.h
diff --git a/reactos/dll/shellext/deskmon/deskmon.rbuild b/reactos/dll/shellext/deskmon/deskmon.rbuild
index 443df5546fa..63d237b6a19 100644
--- a/reactos/dll/shellext/deskmon/deskmon.rbuild
+++ b/reactos/dll/shellext/deskmon/deskmon.rbuild
@@ -1,5 +1,5 @@
-
+
.
0x0500
0x0600
diff --git a/reactos/dll/shellext/fontext/fontext.rbuild b/reactos/dll/shellext/fontext/fontext.rbuild
index 7986fee6620..d27e1e47853 100644
--- a/reactos/dll/shellext/fontext/fontext.rbuild
+++ b/reactos/dll/shellext/fontext/fontext.rbuild
@@ -1,5 +1,5 @@
-
+
.
0x0500
0x0600
diff --git a/reactos/dll/win32/acledit/acledit.rbuild b/reactos/dll/win32/acledit/acledit.rbuild
index cad5f42e0aa..047b0aceea9 100644
--- a/reactos/dll/win32/acledit/acledit.rbuild
+++ b/reactos/dll/win32/acledit/acledit.rbuild
@@ -1,5 +1,5 @@
-
+
.
diff --git a/reactos/dll/win32/aclui/aclui.rbuild b/reactos/dll/win32/aclui/aclui.rbuild
index 5dd969b4fe3..ecbffd50a63 100644
--- a/reactos/dll/win32/aclui/aclui.rbuild
+++ b/reactos/dll/win32/aclui/aclui.rbuild
@@ -1,5 +1,5 @@
-
+
.
0x0500
0x0600
diff --git a/reactos/dll/win32/advpack/advpack.rbuild b/reactos/dll/win32/advpack/advpack.rbuild
index de904cbb218..b0a4a121719 100644
--- a/reactos/dll/win32/advpack/advpack.rbuild
+++ b/reactos/dll/win32/advpack/advpack.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/atl/atl.rbuild b/reactos/dll/win32/atl/atl.rbuild
index eed64fffb52..cdbfa23cd10 100644
--- a/reactos/dll/win32/atl/atl.rbuild
+++ b/reactos/dll/win32/atl/atl.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/avifil32/avifil32.rbuild b/reactos/dll/win32/avifil32/avifil32.rbuild
index 854672b482c..e5a053d824d 100644
--- a/reactos/dll/win32/avifil32/avifil32.rbuild
+++ b/reactos/dll/win32/avifil32/avifil32.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/browseui/browseui.rbuild b/reactos/dll/win32/browseui/browseui.rbuild
index 671f9ccfa33..2c19c0dd57a 100644
--- a/reactos/dll/win32/browseui/browseui.rbuild
+++ b/reactos/dll/win32/browseui/browseui.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
.
diff --git a/reactos/dll/win32/cabinet/cabinet.rbuild b/reactos/dll/win32/cabinet/cabinet.rbuild
index f8e369dcfdf..20a6ca889a1 100644
--- a/reactos/dll/win32/cabinet/cabinet.rbuild
+++ b/reactos/dll/win32/cabinet/cabinet.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/cards/cards.rbuild b/reactos/dll/win32/cards/cards.rbuild
index ace4c0c4a7c..065b1e17fa1 100644
--- a/reactos/dll/win32/cards/cards.rbuild
+++ b/reactos/dll/win32/cards/cards.rbuild
@@ -1,5 +1,5 @@
-
+
.
diff --git a/reactos/dll/win32/clusapi/clusapi.rbuild b/reactos/dll/win32/clusapi/clusapi.rbuild
index 410acc5dc57..1ea58a0c870 100644
--- a/reactos/dll/win32/clusapi/clusapi.rbuild
+++ b/reactos/dll/win32/clusapi/clusapi.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/comcat/comcat.rbuild b/reactos/dll/win32/comcat/comcat.rbuild
index d9c2fb76d6a..551b99d1010 100644
--- a/reactos/dll/win32/comcat/comcat.rbuild
+++ b/reactos/dll/win32/comcat/comcat.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/comctl32/comctl32.rbuild b/reactos/dll/win32/comctl32/comctl32.rbuild
index 95259d9bb07..b55934b6fa6 100644
--- a/reactos/dll/win32/comctl32/comctl32.rbuild
+++ b/reactos/dll/win32/comctl32/comctl32.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/comdlg32/comdlg32.rbuild b/reactos/dll/win32/comdlg32/comdlg32.rbuild
index bce7564e654..57e7c2244d3 100644
--- a/reactos/dll/win32/comdlg32/comdlg32.rbuild
+++ b/reactos/dll/win32/comdlg32/comdlg32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/compstui/compstui.rbuild b/reactos/dll/win32/compstui/compstui.rbuild
index 8d7403a9796..cd7ce261511 100644
--- a/reactos/dll/win32/compstui/compstui.rbuild
+++ b/reactos/dll/win32/compstui/compstui.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/credui/credui.rbuild b/reactos/dll/win32/credui/credui.rbuild
index e07e0f8a580..0ef5423d39c 100644
--- a/reactos/dll/win32/credui/credui.rbuild
+++ b/reactos/dll/win32/credui/credui.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/crypt32/crypt32.rbuild b/reactos/dll/win32/crypt32/crypt32.rbuild
index 69026ee8d94..f70d712affc 100644
--- a/reactos/dll/win32/crypt32/crypt32.rbuild
+++ b/reactos/dll/win32/crypt32/crypt32.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/cryptdll/cryptdll.rbuild b/reactos/dll/win32/cryptdll/cryptdll.rbuild
index d8a3f478dbd..23da95bff75 100644
--- a/reactos/dll/win32/cryptdll/cryptdll.rbuild
+++ b/reactos/dll/win32/cryptdll/cryptdll.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/cryptnet/cryptnet.rbuild b/reactos/dll/win32/cryptnet/cryptnet.rbuild
index d8a50dda11b..c263f11f28d 100644
--- a/reactos/dll/win32/cryptnet/cryptnet.rbuild
+++ b/reactos/dll/win32/cryptnet/cryptnet.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/cryptui/cryptui.rbuild b/reactos/dll/win32/cryptui/cryptui.rbuild
index 63a6d1a2fd2..bab940f40ff 100644
--- a/reactos/dll/win32/cryptui/cryptui.rbuild
+++ b/reactos/dll/win32/cryptui/cryptui.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/dbghelp/dbghelp.rbuild b/reactos/dll/win32/dbghelp/dbghelp.rbuild
index 236536ac3e5..ff2a5c2fe75 100644
--- a/reactos/dll/win32/dbghelp/dbghelp.rbuild
+++ b/reactos/dll/win32/dbghelp/dbghelp.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/dciman32/dciman32.rbuild b/reactos/dll/win32/dciman32/dciman32.rbuild
index 35367a62417..9b03c62d68a 100644
--- a/reactos/dll/win32/dciman32/dciman32.rbuild
+++ b/reactos/dll/win32/dciman32/dciman32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/devmgr/devmgr.rbuild b/reactos/dll/win32/devmgr/devmgr.rbuild
index 226979ae493..926ce289878 100644
--- a/reactos/dll/win32/devmgr/devmgr.rbuild
+++ b/reactos/dll/win32/devmgr/devmgr.rbuild
@@ -1,6 +1,6 @@
.
-
+
0x600
0x501
0x501
diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
index 6964d56c0a9..49fe65840cc 100644
--- a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
+++ b/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
@@ -1,5 +1,5 @@
-
+
include
diff --git a/reactos/dll/win32/fusion/fusion.rbuild b/reactos/dll/win32/fusion/fusion.rbuild
index 90cabde35b4..0d3badf7635 100644
--- a/reactos/dll/win32/fusion/fusion.rbuild
+++ b/reactos/dll/win32/fusion/fusion.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/gdiplus/gdiplus.rbuild b/reactos/dll/win32/gdiplus/gdiplus.rbuild
index eb165bb85c3..fe7281c21ae 100644
--- a/reactos/dll/win32/gdiplus/gdiplus.rbuild
+++ b/reactos/dll/win32/gdiplus/gdiplus.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/getuname/getuname.rbuild b/reactos/dll/win32/getuname/getuname.rbuild
index d10a924d570..a576b6baf48 100644
--- a/reactos/dll/win32/getuname/getuname.rbuild
+++ b/reactos/dll/win32/getuname/getuname.rbuild
@@ -1,7 +1,7 @@
-
+
.
0x600
0x600
diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
index 53bbdf244bb..6c7cfc888b6 100644
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
include/reactos
diff --git a/reactos/dll/win32/hlink/hlink.rbuild b/reactos/dll/win32/hlink/hlink.rbuild
index 531c3ff8d5b..b5b5eb85391 100644
--- a/reactos/dll/win32/hlink/hlink.rbuild
+++ b/reactos/dll/win32/hlink/hlink.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/icmp/icmp.rbuild b/reactos/dll/win32/icmp/icmp.rbuild
index 295a5653728..ce838e09b79 100644
--- a/reactos/dll/win32/icmp/icmp.rbuild
+++ b/reactos/dll/win32/icmp/icmp.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/reactos/wine
0x501
diff --git a/reactos/dll/win32/imagehlp/imagehlp.rbuild b/reactos/dll/win32/imagehlp/imagehlp.rbuild
index c65b8f5ee09..b03f5af077a 100644
--- a/reactos/dll/win32/imagehlp/imagehlp.rbuild
+++ b/reactos/dll/win32/imagehlp/imagehlp.rbuild
@@ -1,5 +1,5 @@
-
+
.
0x600
0x0600
diff --git a/reactos/dll/win32/imm32/imm32.rbuild b/reactos/dll/win32/imm32/imm32.rbuild
index 90253745461..421b1a0c9c5 100644
--- a/reactos/dll/win32/imm32/imm32.rbuild
+++ b/reactos/dll/win32/imm32/imm32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/inetcomm/inetcomm.rbuild b/reactos/dll/win32/inetcomm/inetcomm.rbuild
index 428f45bed9d..0bc13f6fac9 100644
--- a/reactos/dll/win32/inetcomm/inetcomm.rbuild
+++ b/reactos/dll/win32/inetcomm/inetcomm.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/inetmib1/inetmib1.rbuild b/reactos/dll/win32/inetmib1/inetmib1.rbuild
index ad685b8fcc2..0f4fd6a5249 100644
--- a/reactos/dll/win32/inetmib1/inetmib1.rbuild
+++ b/reactos/dll/win32/inetmib1/inetmib1.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
index b93ab591916..5acca9019ed 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
+++ b/reactos/dll/win32/iphlpapi/iphlpapi.rbuild
@@ -1,5 +1,5 @@
-
+
include
include/reactos/wine
wine
diff --git a/reactos/dll/win32/jscript/jscript.rbuild b/reactos/dll/win32/jscript/jscript.rbuild
index b9308743f38..eca0c55f9c3 100644
--- a/reactos/dll/win32/jscript/jscript.rbuild
+++ b/reactos/dll/win32/jscript/jscript.rbuild
@@ -1,7 +1,7 @@
-
+
.
.
include/reactos/wine
diff --git a/reactos/dll/win32/lpk/lpk.rbuild b/reactos/dll/win32/lpk/lpk.rbuild
index eacdef6f384..41a294f658f 100644
--- a/reactos/dll/win32/lpk/lpk.rbuild
+++ b/reactos/dll/win32/lpk/lpk.rbuild
@@ -1,5 +1,5 @@
-
+
include
0x0600
diff --git a/reactos/dll/win32/lz32/lz32.rbuild b/reactos/dll/win32/lz32/lz32.rbuild
index 423239537d9..f4fb312f701 100644
--- a/reactos/dll/win32/lz32/lz32.rbuild
+++ b/reactos/dll/win32/lz32/lz32.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/mapi32/mapi32.rbuild b/reactos/dll/win32/mapi32/mapi32.rbuild
index dc600d6dd3f..e24d1158627 100644
--- a/reactos/dll/win32/mapi32/mapi32.rbuild
+++ b/reactos/dll/win32/mapi32/mapi32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/mlang/mlang.rbuild b/reactos/dll/win32/mlang/mlang.rbuild
index 46a20c9a0d0..cc083279adc 100644
--- a/reactos/dll/win32/mlang/mlang.rbuild
+++ b/reactos/dll/win32/mlang/mlang.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/mmdrv/mmdrv.rbuild b/reactos/dll/win32/mmdrv/mmdrv.rbuild
index f9627195b51..44430714713 100644
--- a/reactos/dll/win32/mmdrv/mmdrv.rbuild
+++ b/reactos/dll/win32/mmdrv/mmdrv.rbuild
@@ -1,5 +1,5 @@
-
+
.
ntdll
diff --git a/reactos/dll/win32/modemui/modemui.rbuild b/reactos/dll/win32/modemui/modemui.rbuild
index afa5a91eeef..c316c0dd5e8 100644
--- a/reactos/dll/win32/modemui/modemui.rbuild
+++ b/reactos/dll/win32/modemui/modemui.rbuild
@@ -1,5 +1,5 @@
-
+
.
0x0500
diff --git a/reactos/dll/win32/mpr/mpr.rbuild b/reactos/dll/win32/mpr/mpr.rbuild
index 8df5fd1b614..cc17d609e5f 100644
--- a/reactos/dll/win32/mpr/mpr.rbuild
+++ b/reactos/dll/win32/mpr/mpr.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/mprapi/mprapi.rbuild b/reactos/dll/win32/mprapi/mprapi.rbuild
index 542f8afc47c..0044f108913 100644
--- a/reactos/dll/win32/mprapi/mprapi.rbuild
+++ b/reactos/dll/win32/mprapi/mprapi.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/msacm32/msacm32.rbuild b/reactos/dll/win32/msacm32/msacm32.rbuild
index 9d83ecfa107..337a99b911b 100644
--- a/reactos/dll/win32/msacm32/msacm32.rbuild
+++ b/reactos/dll/win32/msacm32/msacm32.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/reactos/wine
0x600
diff --git a/reactos/dll/win32/mscoree/mscoree.rbuild b/reactos/dll/win32/mscoree/mscoree.rbuild
index 7c805276357..76726a3e57f 100644
--- a/reactos/dll/win32/mscoree/mscoree.rbuild
+++ b/reactos/dll/win32/mscoree/mscoree.rbuild
@@ -1,5 +1,5 @@
-
+
.
wine
kernel32
diff --git a/reactos/dll/win32/msgina/msgina.rbuild b/reactos/dll/win32/msgina/msgina.rbuild
index d000673cc6a..951dc1c97e2 100644
--- a/reactos/dll/win32/msgina/msgina.rbuild
+++ b/reactos/dll/win32/msgina/msgina.rbuild
@@ -1,5 +1,5 @@
-
+
.
include
ntdll
diff --git a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
index 2f476623d86..a4ff711eb15 100644
--- a/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
+++ b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.rbuild
@@ -4,7 +4,7 @@
mshtml_tlb.idl
-
+
.
mshtml_tlb
diff --git a/reactos/dll/win32/mshtml/mshtml.rbuild b/reactos/dll/win32/mshtml/mshtml.rbuild
index 5db3ddd01a1..5bff1fc90af 100644
--- a/reactos/dll/win32/mshtml/mshtml.rbuild
+++ b/reactos/dll/win32/mshtml/mshtml.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/msi/msi.rbuild b/reactos/dll/win32/msi/msi.rbuild
index c2c37e79369..99d557331b1 100644
--- a/reactos/dll/win32/msi/msi.rbuild
+++ b/reactos/dll/win32/msi/msi.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/msimg32/msimg32.rbuild b/reactos/dll/win32/msimg32/msimg32.rbuild
index 117fccb59ab..c8f9a0912c6 100644
--- a/reactos/dll/win32/msimg32/msimg32.rbuild
+++ b/reactos/dll/win32/msimg32/msimg32.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/mstask/mstask.rbuild b/reactos/dll/win32/mstask/mstask.rbuild
index ea4d1f62eb3..02843751570 100644
--- a/reactos/dll/win32/mstask/mstask.rbuild
+++ b/reactos/dll/win32/mstask/mstask.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
index dbe765ca396..8c5f2240f34 100644
--- a/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
+++ b/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/msvcrt40/msvcrt40.rbuild b/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
index b02916a86ab..200942afad0 100644
--- a/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
+++ b/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/msvfw32/msvfw32.rbuild b/reactos/dll/win32/msvfw32/msvfw32.rbuild
index d1e3f508f60..5cf4f895a3d 100644
--- a/reactos/dll/win32/msvfw32/msvfw32.rbuild
+++ b/reactos/dll/win32/msvfw32/msvfw32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/msxml3/msxml3.rbuild b/reactos/dll/win32/msxml3/msxml3.rbuild
index ce4fd47524b..e61d94bc43f 100644
--- a/reactos/dll/win32/msxml3/msxml3.rbuild
+++ b/reactos/dll/win32/msxml3/msxml3.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
.
diff --git a/reactos/dll/win32/nddeapi/nddeapi.rbuild b/reactos/dll/win32/nddeapi/nddeapi.rbuild
index 8700ed6b8ff..80aacc2ef6d 100644
--- a/reactos/dll/win32/nddeapi/nddeapi.rbuild
+++ b/reactos/dll/win32/nddeapi/nddeapi.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/netapi32/netapi32.rbuild b/reactos/dll/win32/netapi32/netapi32.rbuild
index 9c2ef41ff14..dd6e1f85b29 100644
--- a/reactos/dll/win32/netapi32/netapi32.rbuild
+++ b/reactos/dll/win32/netapi32/netapi32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/netcfgx/netcfgx.rbuild b/reactos/dll/win32/netcfgx/netcfgx.rbuild
index 8c6e0e37106..c6d7998e184 100644
--- a/reactos/dll/win32/netcfgx/netcfgx.rbuild
+++ b/reactos/dll/win32/netcfgx/netcfgx.rbuild
@@ -1,5 +1,5 @@
-
+
ntdll
rpcrt4
diff --git a/reactos/dll/win32/netid/netid.rbuild b/reactos/dll/win32/netid/netid.rbuild
index 0bab404e897..021663c41ed 100644
--- a/reactos/dll/win32/netid/netid.rbuild
+++ b/reactos/dll/win32/netid/netid.rbuild
@@ -1,5 +1,5 @@
-
+
.
0x0500
0x0600
diff --git a/reactos/dll/win32/netshell/netshell.rbuild b/reactos/dll/win32/netshell/netshell.rbuild
index 474472e69ef..23440f88854 100644
--- a/reactos/dll/win32/netshell/netshell.rbuild
+++ b/reactos/dll/win32/netshell/netshell.rbuild
@@ -1,6 +1,6 @@
-
+
.
0x600
0x600
diff --git a/reactos/dll/win32/newdev/newdev.rbuild b/reactos/dll/win32/newdev/newdev.rbuild
index 910f54260b4..d080d200889 100644
--- a/reactos/dll/win32/newdev/newdev.rbuild
+++ b/reactos/dll/win32/newdev/newdev.rbuild
@@ -1,6 +1,6 @@
.
-
+
0x0600
0x0501
newdev.c
diff --git a/reactos/dll/win32/ntdsapi/ntdsapi.rbuild b/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
index ea1a3ac2b07..5b922872fe9 100644
--- a/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
+++ b/reactos/dll/win32/ntdsapi/ntdsapi.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/ntmarta/ntmarta.rbuild b/reactos/dll/win32/ntmarta/ntmarta.rbuild
index bbe1ac33df6..3f3b2e893ae 100644
--- a/reactos/dll/win32/ntmarta/ntmarta.rbuild
+++ b/reactos/dll/win32/ntmarta/ntmarta.rbuild
@@ -1,5 +1,5 @@
-
+
.
0x0500
0x600
diff --git a/reactos/dll/win32/objsel/objsel.rbuild b/reactos/dll/win32/objsel/objsel.rbuild
index 18c6dbf05df..e5e0b17ea1b 100644
--- a/reactos/dll/win32/objsel/objsel.rbuild
+++ b/reactos/dll/win32/objsel/objsel.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/odbc32/odbc32.rbuild b/reactos/dll/win32/odbc32/odbc32.rbuild
index 4a968919a51..cddd6fa713c 100644
--- a/reactos/dll/win32/odbc32/odbc32.rbuild
+++ b/reactos/dll/win32/odbc32/odbc32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/odbccp32/odbccp32.rbuild b/reactos/dll/win32/odbccp32/odbccp32.rbuild
index f8d461c36a8..2e112681434 100644
--- a/reactos/dll/win32/odbccp32/odbccp32.rbuild
+++ b/reactos/dll/win32/odbccp32/odbccp32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/ole32/ole32.rbuild b/reactos/dll/win32/ole32/ole32.rbuild
index 47082efd6b3..37fa9b7faee 100644
--- a/reactos/dll/win32/ole32/ole32.rbuild
+++ b/reactos/dll/win32/ole32/ole32.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/oleacc/oleacc.rbuild b/reactos/dll/win32/oleacc/oleacc.rbuild
index 46b65e27095..6fc3183658e 100644
--- a/reactos/dll/win32/oleacc/oleacc.rbuild
+++ b/reactos/dll/win32/oleacc/oleacc.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/oleaut32/oleaut32.rbuild b/reactos/dll/win32/oleaut32/oleaut32.rbuild
index 83a0e2da883..4e37d00e9db 100644
--- a/reactos/dll/win32/oleaut32/oleaut32.rbuild
+++ b/reactos/dll/win32/oleaut32/oleaut32.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/oledlg/oledlg.rbuild b/reactos/dll/win32/oledlg/oledlg.rbuild
index 53fd2511cc9..ca987921f71 100644
--- a/reactos/dll/win32/oledlg/oledlg.rbuild
+++ b/reactos/dll/win32/oledlg/oledlg.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/olepro32/olepro32.rbuild b/reactos/dll/win32/olepro32/olepro32.rbuild
index 192485486c1..f14d281d911 100644
--- a/reactos/dll/win32/olepro32/olepro32.rbuild
+++ b/reactos/dll/win32/olepro32/olepro32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/pdh/pdh.rbuild b/reactos/dll/win32/pdh/pdh.rbuild
index 1a3e081e3d3..c1b30627257 100644
--- a/reactos/dll/win32/pdh/pdh.rbuild
+++ b/reactos/dll/win32/pdh/pdh.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/powrprof/powrprof.rbuild b/reactos/dll/win32/powrprof/powrprof.rbuild
index 1cea520825c..8425b685b1d 100644
--- a/reactos/dll/win32/powrprof/powrprof.rbuild
+++ b/reactos/dll/win32/powrprof/powrprof.rbuild
@@ -1,7 +1,7 @@
-
+
.
0x600
0x600
diff --git a/reactos/dll/win32/printui/printui.rbuild b/reactos/dll/win32/printui/printui.rbuild
index de3560df3ac..216ec665db7 100644
--- a/reactos/dll/win32/printui/printui.rbuild
+++ b/reactos/dll/win32/printui/printui.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/pstorec/pstorec.rbuild b/reactos/dll/win32/pstorec/pstorec.rbuild
index ea4383dddd1..493a30f22df 100644
--- a/reactos/dll/win32/pstorec/pstorec.rbuild
+++ b/reactos/dll/win32/pstorec/pstorec.rbuild
@@ -1,5 +1,5 @@
-
+
.
wine
kernel32
diff --git a/reactos/dll/win32/rasapi32/rasapi32.rbuild b/reactos/dll/win32/rasapi32/rasapi32.rbuild
index 67451d51c7b..d78b7e17979 100644
--- a/reactos/dll/win32/rasapi32/rasapi32.rbuild
+++ b/reactos/dll/win32/rasapi32/rasapi32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/rasdlg/rasdlg.rbuild b/reactos/dll/win32/rasdlg/rasdlg.rbuild
index 22759f66b03..6f31a16681f 100644
--- a/reactos/dll/win32/rasdlg/rasdlg.rbuild
+++ b/reactos/dll/win32/rasdlg/rasdlg.rbuild
@@ -1,5 +1,5 @@
-
+
.
wine
diff --git a/reactos/dll/win32/rasman/rasman.rbuild b/reactos/dll/win32/rasman/rasman.rbuild
index 5f72da00a9d..5df7820ec03 100644
--- a/reactos/dll/win32/rasman/rasman.rbuild
+++ b/reactos/dll/win32/rasman/rasman.rbuild
@@ -1,5 +1,5 @@
-
+
.
wine
diff --git a/reactos/dll/win32/riched20/riched20.rbuild b/reactos/dll/win32/riched20/riched20.rbuild
index 49bcba6bbb3..95c54845fdd 100644
--- a/reactos/dll/win32/riched20/riched20.rbuild
+++ b/reactos/dll/win32/riched20/riched20.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/riched32/riched32.rbuild b/reactos/dll/win32/riched32/riched32.rbuild
index 0b370e2af45..948f6ea43c5 100644
--- a/reactos/dll/win32/riched32/riched32.rbuild
+++ b/reactos/dll/win32/riched32/riched32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
index 132ed2161de..455dd4b80d7 100644
--- a/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
+++ b/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
@@ -1,6 +1,6 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/rsabase/rsabase.rbuild b/reactos/dll/win32/rsabase/rsabase.rbuild
index 50d0c58b31d..a57bdcc262e 100644
--- a/reactos/dll/win32/rsabase/rsabase.rbuild
+++ b/reactos/dll/win32/rsabase/rsabase.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/rsaenh/rsaenh.rbuild b/reactos/dll/win32/rsaenh/rsaenh.rbuild
index e9805c06545..6b0446a00e4 100644
--- a/reactos/dll/win32/rsaenh/rsaenh.rbuild
+++ b/reactos/dll/win32/rsaenh/rsaenh.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/samsrv/samsrv.rbuild b/reactos/dll/win32/samsrv/samsrv.rbuild
index 44f8c06f6d9..fb0e46298a3 100644
--- a/reactos/dll/win32/samsrv/samsrv.rbuild
+++ b/reactos/dll/win32/samsrv/samsrv.rbuild
@@ -1,7 +1,7 @@
-
+
.
ntdll
kernel32
diff --git a/reactos/dll/win32/schannel/schannel.rbuild b/reactos/dll/win32/schannel/schannel.rbuild
index 3a085816706..52251fe4619 100644
--- a/reactos/dll/win32/schannel/schannel.rbuild
+++ b/reactos/dll/win32/schannel/schannel.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/sensapi/sensapi.rbuild b/reactos/dll/win32/sensapi/sensapi.rbuild
index 0fd2ccb4355..e4cc7043caa 100644
--- a/reactos/dll/win32/sensapi/sensapi.rbuild
+++ b/reactos/dll/win32/sensapi/sensapi.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/serialui/serialui.rbuild b/reactos/dll/win32/serialui/serialui.rbuild
index 5d09b18436c..eb43bd52fea 100644
--- a/reactos/dll/win32/serialui/serialui.rbuild
+++ b/reactos/dll/win32/serialui/serialui.rbuild
@@ -1,5 +1,5 @@
-
+
.
kernel32
user32
diff --git a/reactos/dll/win32/setupapi/setupapi.rbuild b/reactos/dll/win32/setupapi/setupapi.rbuild
index 0a0301a917d..9f5a3ba20f0 100644
--- a/reactos/dll/win32/setupapi/setupapi.rbuild
+++ b/reactos/dll/win32/setupapi/setupapi.rbuild
@@ -1,7 +1,7 @@
-
+
.
include/reactos/wine
.
diff --git a/reactos/dll/win32/sfc/sfc.rbuild b/reactos/dll/win32/sfc/sfc.rbuild
index d3ad6561cb4..263c55ca301 100644
--- a/reactos/dll/win32/sfc/sfc.rbuild
+++ b/reactos/dll/win32/sfc/sfc.rbuild
@@ -1,5 +1,5 @@
-
+
.
kernel32
sfc.c
diff --git a/reactos/dll/win32/sfc_os/sfc_os.rbuild b/reactos/dll/win32/sfc_os/sfc_os.rbuild
index 2e02263c20e..6cc89c87ae9 100644
--- a/reactos/dll/win32/sfc_os/sfc_os.rbuild
+++ b/reactos/dll/win32/sfc_os/sfc_os.rbuild
@@ -1,5 +1,5 @@
-
+
.
kernel32
sfc_os.c
diff --git a/reactos/dll/win32/shdocvw/shdocvw.rbuild b/reactos/dll/win32/shdocvw/shdocvw.rbuild
index 0e8a337d0a7..5678ab47b69 100644
--- a/reactos/dll/win32/shdocvw/shdocvw.rbuild
+++ b/reactos/dll/win32/shdocvw/shdocvw.rbuild
@@ -1,6 +1,6 @@
-
+
.
include/reactos/wine
0x600
diff --git a/reactos/dll/win32/shell32/shell32.rbuild b/reactos/dll/win32/shell32/shell32.rbuild
index d3eeeef2782..7bc769c32f4 100644
--- a/reactos/dll/win32/shell32/shell32.rbuild
+++ b/reactos/dll/win32/shell32/shell32.rbuild
@@ -1,6 +1,6 @@
-
+
.
.
include/reactos/wine
diff --git a/reactos/dll/win32/shfolder/shfolder.rbuild b/reactos/dll/win32/shfolder/shfolder.rbuild
index 1d3aa77c526..2b08ca47d79 100644
--- a/reactos/dll/win32/shfolder/shfolder.rbuild
+++ b/reactos/dll/win32/shfolder/shfolder.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/shimgvw/shimgvw.rbuild b/reactos/dll/win32/shimgvw/shimgvw.rbuild
index 99e1d1364cc..07ff24d7d27 100644
--- a/reactos/dll/win32/shimgvw/shimgvw.rbuild
+++ b/reactos/dll/win32/shimgvw/shimgvw.rbuild
@@ -1,5 +1,5 @@
-
+
.
kernel32
diff --git a/reactos/dll/win32/shlwapi/shlwapi.rbuild b/reactos/dll/win32/shlwapi/shlwapi.rbuild
index cd9a166d915..2fda4a456b6 100644
--- a/reactos/dll/win32/shlwapi/shlwapi.rbuild
+++ b/reactos/dll/win32/shlwapi/shlwapi.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/snmpapi/snmpapi.rbuild b/reactos/dll/win32/snmpapi/snmpapi.rbuild
index e6ee0f88dc8..ad9960e078a 100644
--- a/reactos/dll/win32/snmpapi/snmpapi.rbuild
+++ b/reactos/dll/win32/snmpapi/snmpapi.rbuild
@@ -1,5 +1,5 @@
-
+
.
ntdll
diff --git a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
index 4d9fd38f6bc..8d346b7cc78 100644
--- a/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
+++ b/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
@@ -9,7 +9,7 @@
std_ole_v2.idl
-
+
.
.
include/reactos/wine
diff --git a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
index 137073c2f0b..fe379917cf8 100644
--- a/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
+++ b/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
@@ -9,7 +9,7 @@
std_ole_v1.idl
-
+
.
.
include/reactos/wine
diff --git a/reactos/dll/win32/sxs/sxs.rbuild b/reactos/dll/win32/sxs/sxs.rbuild
index 7559626a809..e9d8e47ef50 100644
--- a/reactos/dll/win32/sxs/sxs.rbuild
+++ b/reactos/dll/win32/sxs/sxs.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/tapi32/tapi32.rbuild b/reactos/dll/win32/tapi32/tapi32.rbuild
index f1564856f9e..c4547d66036 100644
--- a/reactos/dll/win32/tapi32/tapi32.rbuild
+++ b/reactos/dll/win32/tapi32/tapi32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/urlmon/urlmon.rbuild b/reactos/dll/win32/urlmon/urlmon.rbuild
index 9493c102eed..710fb19a372 100644
--- a/reactos/dll/win32/urlmon/urlmon.rbuild
+++ b/reactos/dll/win32/urlmon/urlmon.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/usp10/usp10.rbuild b/reactos/dll/win32/usp10/usp10.rbuild
index cb7b18c0abb..6f2af469aa8 100644
--- a/reactos/dll/win32/usp10/usp10.rbuild
+++ b/reactos/dll/win32/usp10/usp10.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/uxtheme/uxtheme.rbuild b/reactos/dll/win32/uxtheme/uxtheme.rbuild
index 38b1f7b9c6b..a67bdaf8c4a 100644
--- a/reactos/dll/win32/uxtheme/uxtheme.rbuild
+++ b/reactos/dll/win32/uxtheme/uxtheme.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
index 80e2434d146..8ccedce0b41 100644
--- a/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
+++ b/reactos/dll/win32/vdmdbg/vdmdbg.rbuild
@@ -1,5 +1,5 @@
-
+
.
ntdll
kernel32
diff --git a/reactos/dll/win32/version/version.rbuild b/reactos/dll/win32/version/version.rbuild
index 5ed46283e03..11a760fec56 100644
--- a/reactos/dll/win32/version/version.rbuild
+++ b/reactos/dll/win32/version/version.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild b/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
index c9db2a8999c..dd285bf5cdf 100644
--- a/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
+++ b/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild
@@ -1,5 +1,5 @@
-
+
.
advapi32
diff --git a/reactos/dll/win32/winhttp/winhttp.rbuild b/reactos/dll/win32/winhttp/winhttp.rbuild
index 5841090544c..923e4bd3d4d 100644
--- a/reactos/dll/win32/winhttp/winhttp.rbuild
+++ b/reactos/dll/win32/winhttp/winhttp.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/wininet/wininet.rbuild b/reactos/dll/win32/wininet/wininet.rbuild
index 29700bafdee..454c96e1f5c 100644
--- a/reactos/dll/win32/wininet/wininet.rbuild
+++ b/reactos/dll/win32/wininet/wininet.rbuild
@@ -3,7 +3,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/winmm/midimap/midimap.rbuild b/reactos/dll/win32/winmm/midimap/midimap.rbuild
index 901479650ef..1369968fa8a 100644
--- a/reactos/dll/win32/winmm/midimap/midimap.rbuild
+++ b/reactos/dll/win32/winmm/midimap/midimap.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/wine
0x600
diff --git a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
index c493f035482..16c62d48024 100644
--- a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
+++ b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
@@ -1,5 +1,5 @@
-
+
.
include/reactos/wine
0x600
diff --git a/reactos/dll/win32/winmm/winmm.rbuild b/reactos/dll/win32/winmm/winmm.rbuild
index 59205881b1e..799805fee37 100644
--- a/reactos/dll/win32/winmm/winmm.rbuild
+++ b/reactos/dll/win32/winmm/winmm.rbuild
@@ -8,7 +8,7 @@
-
+
.
include/reactos/wine
0x600
diff --git a/reactos/dll/win32/wintrust/wintrust.rbuild b/reactos/dll/win32/wintrust/wintrust.rbuild
index baa9b29f178..0cc4f790eb5 100644
--- a/reactos/dll/win32/wintrust/wintrust.rbuild
+++ b/reactos/dll/win32/wintrust/wintrust.rbuild
@@ -1,6 +1,6 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/wldap32/wldap32.rbuild b/reactos/dll/win32/wldap32/wldap32.rbuild
index 2829f918105..ca149a87e25 100644
--- a/reactos/dll/win32/wldap32/wldap32.rbuild
+++ b/reactos/dll/win32/wldap32/wldap32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/dll/win32/wshtcpip/wshtcpip.rbuild b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild
index 6bf2724e9e7..dd64752960a 100644
--- a/reactos/dll/win32/wshtcpip/wshtcpip.rbuild
+++ b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild
@@ -1,7 +1,7 @@
-
+
.
ntdll
kernel32
diff --git a/reactos/dll/win32/wtsapi32/wtsapi32.rbuild b/reactos/dll/win32/wtsapi32/wtsapi32.rbuild
index 89b77a161b8..c0bb0125481 100644
--- a/reactos/dll/win32/wtsapi32/wtsapi32.rbuild
+++ b/reactos/dll/win32/wtsapi32/wtsapi32.rbuild
@@ -2,7 +2,7 @@
-
+
.
include/reactos/wine
diff --git a/reactos/drivers/base/bootvid/bootvid.rbuild b/reactos/drivers/base/bootvid/bootvid.rbuild
index a083300dc0d..895ab0bffbb 100644
--- a/reactos/drivers/base/bootvid/bootvid.rbuild
+++ b/reactos/drivers/base/bootvid/bootvid.rbuild
@@ -1,7 +1,7 @@
-
+
.
ntoskrnl
diff --git a/reactos/drivers/base/kdcom/kdcom.rbuild b/reactos/drivers/base/kdcom/kdcom.rbuild
index 5c28035f588..e1f6ade0b60 100644
--- a/reactos/drivers/base/kdcom/kdcom.rbuild
+++ b/reactos/drivers/base/kdcom/kdcom.rbuild
@@ -1,7 +1,7 @@
-
+
.
ntoskrnl
diff --git a/reactos/drivers/directx/dxapi/dxapi.rbuild b/reactos/drivers/directx/dxapi/dxapi.rbuild
index 55dbdf266e9..8d6d446640e 100644
--- a/reactos/drivers/directx/dxapi/dxapi.rbuild
+++ b/reactos/drivers/directx/dxapi/dxapi.rbuild
@@ -2,7 +2,7 @@
-
+
.
diff --git a/reactos/drivers/directx/dxg/dxg.rbuild b/reactos/drivers/directx/dxg/dxg.rbuild
index 920183fa3b9..5747373114b 100644
--- a/reactos/drivers/directx/dxg/dxg.rbuild
+++ b/reactos/drivers/directx/dxg/dxg.rbuild
@@ -1,7 +1,7 @@
-
+
.
include
subsystems/win32/win32k/include
diff --git a/reactos/drivers/directx/dxgthk/dxgthk.rbuild b/reactos/drivers/directx/dxgthk/dxgthk.rbuild
index c69bce2e9c4..a7de8b79655 100644
--- a/reactos/drivers/directx/dxgthk/dxgthk.rbuild
+++ b/reactos/drivers/directx/dxgthk/dxgthk.rbuild
@@ -2,7 +2,7 @@
-
+
.
win32k
diff --git a/reactos/drivers/ksfilter/ks/ks.rbuild b/reactos/drivers/ksfilter/ks/ks.rbuild
index 4e9301005b3..e89c090aa31 100644
--- a/reactos/drivers/ksfilter/ks/ks.rbuild
+++ b/reactos/drivers/ksfilter/ks/ks.rbuild
@@ -4,7 +4,7 @@
.
..
../include
-
+
ntoskrnl
diff --git a/reactos/drivers/network/tcpip/tcpip.rbuild b/reactos/drivers/network/tcpip/tcpip.rbuild
index 273f679de74..3919ba7a436 100644
--- a/reactos/drivers/network/tcpip/tcpip.rbuild
+++ b/reactos/drivers/network/tcpip/tcpip.rbuild
@@ -1,7 +1,7 @@
-
+
include
include
diff --git a/reactos/drivers/storage/class/class2/class2.rbuild b/reactos/drivers/storage/class/class2/class2.rbuild
index 769ef89f2e9..48ea7b56920 100644
--- a/reactos/drivers/storage/class/class2/class2.rbuild
+++ b/reactos/drivers/storage/class/class2/class2.rbuild
@@ -2,7 +2,7 @@
-
+
ntoskrnl
hal
scsiport
diff --git a/reactos/drivers/storage/ide/pciidex/pciidex.rbuild b/reactos/drivers/storage/ide/pciidex/pciidex.rbuild
index 0691c33b3cf..2941d0f52a3 100644
--- a/reactos/drivers/storage/ide/pciidex/pciidex.rbuild
+++ b/reactos/drivers/storage/ide/pciidex/pciidex.rbuild
@@ -1,7 +1,7 @@
-
+
ntoskrnl
fdo.c
miniport.c
diff --git a/reactos/drivers/storage/port/diskdump/diskdump.rbuild b/reactos/drivers/storage/port/diskdump/diskdump.rbuild
index 35ff83526e2..df39c1636b0 100644
--- a/reactos/drivers/storage/port/diskdump/diskdump.rbuild
+++ b/reactos/drivers/storage/port/diskdump/diskdump.rbuild
@@ -2,7 +2,7 @@
-
+
include/reactos/drivers
ntoskrnl
hal
diff --git a/reactos/drivers/storage/scsiport/scsiport.rbuild b/reactos/drivers/storage/scsiport/scsiport.rbuild
index 98e4707fe50..81a67633467 100644
--- a/reactos/drivers/storage/scsiport/scsiport.rbuild
+++ b/reactos/drivers/storage/scsiport/scsiport.rbuild
@@ -3,7 +3,7 @@
-
+
.
ntoskrnl
hal
diff --git a/reactos/drivers/usb/usbd/usbd.rbuild b/reactos/drivers/usb/usbd/usbd.rbuild
index 5a9f43661cf..1759f89e7a7 100644
--- a/reactos/drivers/usb/usbd/usbd.rbuild
+++ b/reactos/drivers/usb/usbd/usbd.rbuild
@@ -1,7 +1,7 @@
-
+
ntoskrnl
hal
usbd.c
diff --git a/reactos/drivers/video/displays/framebuf/framebuf.rbuild b/reactos/drivers/video/displays/framebuf/framebuf.rbuild
index cdadcab0007..8426b162842 100644
--- a/reactos/drivers/video/displays/framebuf/framebuf.rbuild
+++ b/reactos/drivers/video/displays/framebuf/framebuf.rbuild
@@ -1,7 +1,7 @@
-
+
.
win32k
libcntpr
diff --git a/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild b/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild
index 47c32ec3e4d..bfc08f00751 100644
--- a/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild
+++ b/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild
@@ -1,7 +1,7 @@
-
+
.
win32k
libcntpr
diff --git a/reactos/drivers/video/displays/vga/vgaddi.rbuild b/reactos/drivers/video/displays/vga/vgaddi.rbuild
index ca0d329f0e9..4166883f01d 100644
--- a/reactos/drivers/video/displays/vga/vgaddi.rbuild
+++ b/reactos/drivers/video/displays/vga/vgaddi.rbuild
@@ -1,7 +1,7 @@
-
+
.
libcntpr
win32k
diff --git a/reactos/drivers/video/videoprt/videoprt.rbuild b/reactos/drivers/video/videoprt/videoprt.rbuild
index 4555223509e..a2e1304098e 100644
--- a/reactos/drivers/video/videoprt/videoprt.rbuild
+++ b/reactos/drivers/video/videoprt/videoprt.rbuild
@@ -1,7 +1,7 @@
-
+
.
include
diff --git a/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
index 6f2fc9c06e2..fb4d99c3d9d 100644
--- a/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
+++ b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
@@ -8,7 +8,7 @@
-fno-rtti
-->
-Wno-non-virtual-dtor
-
+
diff --git a/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild b/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
index beef05a26fb..ec0bf226283 100644
--- a/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
+++ b/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
@@ -4,7 +4,7 @@
.
..
../include
-
+
ntoskrnl
stubs.cpp
diff --git a/reactos/drivers/wmi/wmilib.rbuild b/reactos/drivers/wmi/wmilib.rbuild
index 27501ff536c..edfaa729329 100644
--- a/reactos/drivers/wmi/wmilib.rbuild
+++ b/reactos/drivers/wmi/wmilib.rbuild
@@ -1,7 +1,7 @@
-
+
.
ntoskrnl
wmilib.c
diff --git a/reactos/hal/hal/hal.rbuild b/reactos/hal/hal/hal.rbuild
index 83daee13152..564920b85c0 100644
--- a/reactos/hal/hal/hal.rbuild
+++ b/reactos/hal/hal/hal.rbuild
@@ -14,7 +14,7 @@
-
+
include
ntoskrnl
diff --git a/reactos/hal/halarm/up/halup.rbuild b/reactos/hal/halarm/up/halup.rbuild
index 1d13227b541..c2950733365 100644
--- a/reactos/hal/halarm/up/halup.rbuild
+++ b/reactos/hal/halarm/up/halup.rbuild
@@ -1,7 +1,7 @@
-
+
../include
include
diff --git a/reactos/hal/halx86/halmp.rbuild b/reactos/hal/halx86/halmp.rbuild
index 55954536167..724e7896531 100644
--- a/reactos/hal/halx86/halmp.rbuild
+++ b/reactos/hal/halx86/halmp.rbuild
@@ -2,7 +2,7 @@
-
+
include
include
diff --git a/reactos/hal/halx86/halup.rbuild b/reactos/hal/halx86/halup.rbuild
index c588db52f8e..c206b7ed8a7 100644
--- a/reactos/hal/halx86/halup.rbuild
+++ b/reactos/hal/halx86/halup.rbuild
@@ -2,7 +2,7 @@
-
+
include
include
diff --git a/reactos/hal/halx86/halxbox.rbuild b/reactos/hal/halx86/halxbox.rbuild
index 6dff278830f..923583a7e6a 100644
--- a/reactos/hal/halx86/halxbox.rbuild
+++ b/reactos/hal/halx86/halxbox.rbuild
@@ -2,7 +2,7 @@
-
+
include
include
diff --git a/reactos/lib/debugsup/debugsup-ntos.def b/reactos/lib/debugsup/debugsup-ntos.def
deleted file mode 100644
index 6c6164c6b64..00000000000
--- a/reactos/lib/debugsup/debugsup-ntos.def
+++ /dev/null
@@ -1,11 +0,0 @@
-EXPORTS
-DbgBreakPoint@0
-DbgBreakPointWithStatus@4
-DbgPrint
-DbgPrompt@12
-DbgPrintEx
-vDbgPrintExWithPrefix@20
-RtlAssert@16
-RtlUnwind@16
-
-;EOF
diff --git a/reactos/lib/debugsup/debugsup-ntos.spec b/reactos/lib/debugsup/debugsup-ntos.spec
new file mode 100644
index 00000000000..f7ec548c629
--- /dev/null
+++ b/reactos/lib/debugsup/debugsup-ntos.spec
@@ -0,0 +1,8 @@
+@ stdcall DbgBreakPoint()
+@ stdcall DbgBreakPointWithStatus(long)
+@ varargs DbgPrint()
+@ varargs DbgPrintEx()
+@ stdcall DbgPrompt(ptr ptr long)
+@ stdcall RtlAssert(ptr ptr long ptr)
+@ stdcall RtlUnwind(ptr ptr ptr ptr)
+@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr)
diff --git a/reactos/lib/debugsup/debugsup.rbuild b/reactos/lib/debugsup/debugsup.rbuild
index 726633a770e..3e833c9b8fb 100644
--- a/reactos/lib/debugsup/debugsup.rbuild
+++ b/reactos/lib/debugsup/debugsup.rbuild
@@ -2,9 +2,9 @@
-
+
-
+
diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index a015affecc0..c72712df415 100644
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -2,7 +2,7 @@
-
+
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 531c008dd8d..0f98bf0a27a 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -310,6 +310,7 @@ void
MingwModuleHandler::OutputCopyCommand ( const FileLocation& source,
const FileLocation& destination )
{
+ fprintf ( fMakefile, "# OUTPUT COPY COMMAND\n" );
fprintf ( fMakefile,
"\t$(ECHO_CP)\n" );
fprintf ( fMakefile,
@@ -408,7 +409,7 @@ MingwModuleHandler::GetObjectFilename (
else if ( extension == ".mc" || extension == ".MC" )
newExtension = ".rc";
else if ( extension == ".spec" || extension == ".SPEC" )
- newExtension = ".stubs.o";
+ newExtension = "_" + module.name + ".stubs.o";
else if ( extension == ".idl" || extension == ".IDL" )
{
if ( module.type == RpcServer )
@@ -460,6 +461,7 @@ MingwModuleHandler::GenerateCleanTarget () const
if ( module.type == Alias )
return;
+ fprintf ( fMakefile, "# CLEAN TARGET\n" );
fprintf ( fMakefile,
".PHONY: %s_clean\n",
module.name.c_str() );
@@ -501,6 +503,7 @@ MingwModuleHandler::GenerateInstallTarget () const
{
if ( !module.install )
return;
+ fprintf ( fMakefile, "# INSTALL TARGET\n" );
fprintf ( fMakefile, ".PHONY: %s_install\n", module.name.c_str() );
fprintf ( fMakefile,
"%s_install: %s\n",
@@ -511,6 +514,7 @@ MingwModuleHandler::GenerateInstallTarget () const
void
MingwModuleHandler::GenerateDependsTarget () const
{
+ fprintf ( fMakefile, "# DEPENDS TARGET\n" );
fprintf ( fMakefile,
".PHONY: %s_depends\n",
module.name.c_str() );
@@ -783,6 +787,7 @@ MingwModuleHandler::GenerateMacros (
const vector* linkerFlags,
set& used_defs )
{
+ fprintf ( fMakefile, "# MACROS\n" );
GenerateMacro ( assignmentOperation,
cflagsMacro,
data,
@@ -841,6 +846,7 @@ MingwModuleHandler::GenerateSourceMacros (
{
size_t i;
+ fprintf ( fMakefile, "# SOURCE MACROS\n" );
const vector& compilationUnits = data.compilationUnits;
vector headers;
if ( compilationUnits.size () > 0 )
@@ -887,6 +893,7 @@ MingwModuleHandler::GenerateObjectMacros (
vector headers;
vector mcheaders;
vector mcresources;
+ fprintf ( fMakefile, "# OBJECT MACROS\n" );
if ( compilationUnits.size () > 0 )
{
for ( i = 0; i < compilationUnits.size (); i++ )
@@ -1022,7 +1029,7 @@ MingwModuleHandler::GetPrecompiledHeaderFilename () const
module.pch->file->name + ".gch" );
}
-Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) | $(INTERMEDIATE)$(SEP)$(source_dir)\n",
+Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) $(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
Rule arRule2 ( "\t$(ECHO_AR)\n"
@@ -1064,32 +1071,36 @@ Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc",
"$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule winebuildKMRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
- "\t$(ECHO_WINEBLD)\n"
- "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
- "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
- "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c:\n"
+Rule winebuildKMDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+ "\t$(ECHO_WINEBLD)\n"
+ "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
+ "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n\n",
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec",
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def",
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
+Rule winebuildKMRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c:\n"
"\t${cp} $(NUL) $@ 1>$(NUL)\n"
- "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
"\t$(ECHO_CC)\n"
"\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec",
- "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def",
- "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c",
- "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o",
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c",
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
-Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+Rule winebuildDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+ "\t$(ECHO_WINEBLD)\n"
+ "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).spec.def --def -E $(source)\n\n",
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec",
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def",
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
+Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n"
"\t$(ECHO_WINEBLD)\n"
- "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source)\n"
- "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n"
- "\t$(ECHO_WINEBLD)\n"
- "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n"
- "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
+ "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n"
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
"\t$(ECHO_CC)\n"
"\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n",
- "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def",
- "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c",
- "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o",
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c",
+ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
Rule widlHeaderRule ( "$(source): ${$(module_name)_precondition}\n"
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
@@ -1281,6 +1292,8 @@ MingwModuleHandler::GenerateCommands (
size_t i;
Rule *customRule = NULL;
+ fprintf ( fMakefile, "# COMMANDS\n" );
+
for ( i = 0; i < sizeof ( rules ) / sizeof ( rules[0] ); i++ )
{
if ( rules[i].host != HostDontCare && rules[i].host != ModuleHandlerInformations[module.type].DefaultHost )
@@ -1314,6 +1327,8 @@ MingwModuleHandler::GenerateCommands (
void
MingwModuleHandler::GenerateBuildMapCode ( const FileLocation *mapTarget )
{
+ fprintf ( fMakefile, "# BUILD MAP CODE\n" );
+
fprintf ( fMakefile,
"ifeq ($(ROS_BUILDMAP),full)\n" );
@@ -1351,6 +1366,8 @@ MingwModuleHandler::GenerateBuildMapCode ( const FileLocation *mapTarget )
void
MingwModuleHandler::GenerateBuildNonSymbolStrippedCode ()
{
+ fprintf ( fMakefile, "# BUILD NO STRIP CODE\n" );
+
fprintf ( fMakefile,
"ifeq ($(ROS_BUILDNOSTRIP),yes)\n" );
@@ -1427,6 +1444,7 @@ MingwModuleHandler::GenerateCleanObjectsAsYouGoCode () const
void
MingwModuleHandler::GenerateRunRsymCode () const
{
+ fprintf ( fMakefile, "# RUN RSYM CODE\n" );
fprintf ( fMakefile,
"ifneq ($(ROS_GENERATE_RSYM),no)\n" );
fprintf ( fMakefile,
@@ -1440,6 +1458,7 @@ MingwModuleHandler::GenerateRunRsymCode () const
void
MingwModuleHandler::GenerateRunStripCode () const
{
+ fprintf ( fMakefile, "# RUN STRIP CODE\n" );
fprintf ( fMakefile,
"ifeq ($(ROS_LEAN_AND_MEAN),yes)\n" );
fprintf ( fMakefile,
@@ -1462,6 +1481,8 @@ MingwModuleHandler::GenerateLinkerCommand (
string objectsMacro = GetObjectsMacro ( module );
string libsMacro = GetLibsMacro ();
+ fprintf ( fMakefile, "# LINKER COMMAND\n" );
+
string target_macro ( GetTargetMacro ( module ) );
string target_folder ( backend->GetFullPath ( *target_file ) );
@@ -1555,6 +1576,7 @@ MingwModuleHandler::GeneratePhonyTarget() const
string targetMacro ( GetTargetMacro ( module ) );
const FileLocation *target_file = GetTargetFilename ( module, NULL );
+ fprintf ( fMakefile, "# PHONY TARGET\n" );
fprintf ( fMakefile,
".PHONY: %s\n\n",
targetMacro.c_str ());
@@ -1571,6 +1593,8 @@ MingwModuleHandler::GenerateObjectFileTargets ( const IfableData& data )
size_t i;
string moduleDependencies;
+ fprintf ( fMakefile, "# OBJECT FILE TARGETS\n" );
+
const vector& compilationUnits = data.compilationUnits;
for ( i = 0; i < compilationUnits.size (); i++ )
{
@@ -1607,6 +1631,8 @@ MingwModuleHandler::GenerateObjectFileTargets ()
{
const FileLocation *pchFilename = GetPrecompiledHeaderFilename ();
+ fprintf ( fMakefile, "# OBJECT FILE TARGETS\n" );
+
if ( pchFilename )
{
string cc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gcc}" : "${gcc}" );
@@ -1646,10 +1672,17 @@ MingwModuleHandler::GenerateArchiveTarget ()
const FileLocation *archiveFilename = GetModuleArchiveFilename ();
const FileLocation *definitionFilename = GetDefinitionFilename ();
- arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_files );
+ fprintf ( fMakefile, "# ARCHIVE TARGET\n" );
if ( IsStaticLibrary ( module ) && definitionFilename )
{
+ arRule1.Execute ( fMakefile,
+ backend,
+ module,
+ archiveFilename,
+ clean_files,
+ backend->GetFullName ( *definitionFilename ).c_str () );
+
fprintf ( fMakefile,
"\t${dlltool} --dllname %s --def %s --output-lib $@%s%s\n",
module.importLibrary->dllname.c_str (),
@@ -1657,6 +1690,8 @@ MingwModuleHandler::GenerateArchiveTarget ()
module.mangledSymbols ? "" : " --kill-at",
module.underscoreSymbols ? " --add-underscore" : "" );
}
+ else
+ arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_files );
if ( definitionFilename )
delete definitionFilename;
@@ -1745,6 +1780,7 @@ MingwModuleHandler::GenerateObjectMacro ()
void
MingwModuleHandler::GenerateTargetMacro ()
{
+ fprintf ( fMakefile, "# TARGET MACRO\n" );
fprintf ( fMakefile,
"%s := %s\n",
GetTargetMacro ( module, false ).c_str (),
@@ -1806,6 +1842,8 @@ MingwModuleHandler::GenerateOtherMacros ()
{
set used_defs;
+ fprintf ( fMakefile, "# OTHER MACROS\n" );
+
cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ());
nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ());
windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ());
@@ -1829,21 +1867,11 @@ MingwModuleHandler::GenerateOtherMacros ()
used_defs );
}
- vector s;
- if ( module.importLibrary )
- {
- const vector& compilationUnits = module.non_if_data.compilationUnits;
- for ( size_t i = 0; i < compilationUnits.size (); i++ )
- {
- CompilationUnit& compilationUnit = *compilationUnits[i];
- const FileLocation& sourceFile = compilationUnit.GetFilename ();
- string extension = GetExtension ( sourceFile );
- if ( extension == ".spec" || extension == ".SPEC" )
- GetSpecObjectDependencies ( s, &sourceFile );
- }
- }
- if ( s.size () > 0 )
+ if ( IsWineModule() )
{
+ vector s;
+ GetSpecImplibDependencies ( s, module.importLibrary->source );
+
fprintf (
fMakefile,
"%s +=",
@@ -1971,6 +1999,7 @@ MingwModuleHandler::GenerateOtherMacros ()
void
MingwModuleHandler::GenerateRules ()
{
+ fprintf ( fMakefile, "# RULES\n" );
string targetMacro = GetTargetMacro ( module );
//CLEAN_FILE ( targetMacro );
CLEAN_FILE ( FileLocation ( SourceDirectory, "", targetMacro ) );
@@ -1997,6 +2026,18 @@ MingwModuleHandler::GenerateRules ()
delete ar_target;
}
+ if ( IsWineModule() )
+ {
+ Rule * defRule;
+
+ if ( module.type == Kernel || module.type == KernelModeDLL || module.type == KernelModeDriver )
+ defRule = &winebuildKMDefRule;
+ else
+ defRule = &winebuildDefRule;
+
+ defRule->Execute ( fMakefile, backend, module, module.importLibrary->source, clean_files );
+ }
+
GenerateObjectFileTargets ();
}
@@ -2021,6 +2062,8 @@ MingwModuleHandler::GenerateInvocations () const
if ( module.invocations.size () == 0 )
return;
+ fprintf ( fMakefile, "# INVOCATIONS\n" );
+
size_t iend = module.invocations.size ();
for ( size_t i = 0; i < iend; i++ )
{
@@ -2117,6 +2160,7 @@ MingwModuleHandler::GetDefaultDependencies (
void
MingwModuleHandler::GeneratePreconditionDependencies ()
{
+ fprintf ( fMakefile, "# PRECONDITION DEPENDENCIES\n" );
string preconditionDependenciesName = GetPreconditionDependenciesName ();
string_list dependencies;
GetDefaultDependencies ( dependencies );
@@ -2145,7 +2189,7 @@ MingwModuleHandler::IsWineModule () const
if ( module.importLibrary == NULL)
return false;
- size_t index = module.importLibrary->source->name.rfind ( ".spec.def" );
+ size_t index = module.importLibrary->source->name.rfind ( ".spec" );
return ( index != string::npos );
}
@@ -2156,15 +2200,18 @@ MingwModuleHandler::GetDefinitionFilename () const
if ( module.importLibrary == NULL )
return NULL;
- DirectoryLocation directory;
if ( IsWineModule () )
- directory = IntermediateDirectory;
+ {
+ return new FileLocation ( IntermediateDirectory,
+ module.importLibrary->source->relative_path,
+ GetBasename ( module.importLibrary->source->name ) + "_" + module.name + ".spec.def" );
+ }
else
- directory = SourceDirectory;
-
- return new FileLocation ( directory,
- module.importLibrary->source->relative_path,
- module.importLibrary->source->name );
+ {
+ return new FileLocation ( SourceDirectory,
+ module.importLibrary->source->relative_path,
+ module.importLibrary->source->name );
+ }
}
void
@@ -2179,7 +2226,7 @@ MingwModuleHandler::GenerateImportLibraryTargetIfNeeded ()
vector deps;
GetDefinitionDependencies ( deps );
- fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" );
+ fprintf ( fMakefile, "# IMPORT LIBRARY RULE\n" );
fprintf ( fMakefile, "%s:",
backend->GetFullName ( *library_target ).c_str () );
@@ -2220,17 +2267,19 @@ MingwModuleHandler::GetSpecObjectDependencies (
vector& dependencies,
const FileLocation *file ) const
{
- string basename = GetBasename ( file->name );
+ dependencies.push_back ( FileLocation ( IntermediateDirectory,
+ file->relative_path,
+ GetBasename ( file->name ) + "_" + module.name + ".stubs.c" ) );
+}
- FileLocation defDependency ( IntermediateDirectory,
- file->relative_path,
- basename + ".spec.def" );
- dependencies.push_back ( defDependency );
-
- FileLocation stubsDependency ( IntermediateDirectory,
- file->relative_path,
- basename + ".stubs.c" );
- dependencies.push_back ( stubsDependency );
+void
+MingwModuleHandler::GetSpecImplibDependencies (
+ vector& dependencies,
+ const FileLocation *file ) const
+{
+ dependencies.push_back ( FileLocation ( IntermediateDirectory,
+ file->relative_path,
+ GetBasename ( file->name ) + "_" + module.name + ".spec.def" ) );
}
void
@@ -2337,6 +2386,8 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ()
GenerateRules ();
+ fprintf ( fMakefile, "# BUILD TOOL MODULE TARGET\n" );
+
string linker;
if ( module.cplusplus )
linker = "${host_gpp}";
@@ -2844,6 +2895,8 @@ MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ()
GenerateRules ();
+ fprintf ( fMakefile, "# BOOT LOADER MODULE TARGET\n" );
+
const FileLocation *target_file = GetTargetFilename ( module, NULL );
fprintf ( fMakefile, "%s: %s %s | %s\n",
targetMacro.c_str (),
@@ -2920,6 +2973,8 @@ MingwBootProgramModuleHandler::GenerateBootProgramModuleTarget ()
GenerateRules ();
+ fprintf ( fMakefile, "# BOOT PROGRAM MODULE TARGET\n" );
+
const FileLocation *target_file = GetTargetFilename ( module, NULL );
fprintf ( fMakefile, "%s: %s %s %s | %s\n",
targetMacro.c_str (),
@@ -3094,6 +3149,7 @@ MingwIsoModuleHandler::GetCdFiles (
void
MingwIsoModuleHandler::GenerateIsoModuleTarget ()
{
+ fprintf ( fMakefile, "# ISO MODULE TARGET\n" );
string bootcdDirectory = "cd";
FileLocation bootcd ( OutputDirectory,
bootcdDirectory,
@@ -3287,6 +3343,7 @@ MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory )
void
MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory )
{
+ fprintf ( fMakefile, "# REGISTRY COMMANDS\n" );
FileLocation reactosSystem32ConfigDirectory ( OutputDirectory,
livecdDirectory + sSep + "reactos" + sSep + "system32" + sSep + "config",
"" );
@@ -3301,6 +3358,7 @@ MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory )
void
MingwLiveIsoModuleHandler::GenerateLiveIsoModuleTarget ()
{
+ fprintf ( fMakefile, "# LIVE ISO MODULE TARGET\n" );
string livecdDirectory = module.name;
FileLocation livecd ( OutputDirectory, livecdDirectory, "" );
@@ -3435,6 +3493,7 @@ MingwCabinetModuleHandler::Process ()
GenerateRules ();
+ fprintf ( fMakefile, "# CABINET MODULE TARGET\n" );
const FileLocation *target_file = GetTargetFilename ( module, NULL );
fprintf ( fMakefile, "%s: $(CABMAN_TARGET) | %s\n",
targetMacro.c_str (),
@@ -3466,6 +3525,7 @@ MingwElfExecutableModuleHandler::Process ()
GenerateRules ();
+ fprintf ( fMakefile, "# ELF EXECUTABLE TARGET\n" );
const FileLocation *target_file = GetTargetFilename ( module, NULL );
fprintf ( fMakefile, "%s: %s %s | %s\n",
targetMacro.c_str (),
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index ac300459a82..bf5e4a6e16d 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -148,6 +148,8 @@ private:
const FileLocation *file ) const;
void GetSpecObjectDependencies ( std::vector& dependencies,
const FileLocation *file ) const;
+ void GetSpecImplibDependencies ( std::vector& dependencies,
+ const FileLocation *file ) const;
void GetWidlObjectDependencies ( std::vector& dependencies,
const FileLocation *file ) const;
void GetDefaultDependencies ( string_list& dependencies ) const;
diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index e224743c058..d84ecc9059f 100644
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -1713,12 +1713,6 @@ ImportLibrary::ImportLibrary ( const Project& project,
"root",
att->value );
}
- else
- {
- size_t index = definition->value.rfind ( ".spec.def" );
- if ( index != string::npos )
- directory = IntermediateDirectory;
- }
if ( dllname )
this->dllname = dllname->value;