Skip to content

Commit 96b27cd

Browse files
yagoulasyagoulas
committed
Sync to trunk (2/2)
Add crt, ndk, ddk, and dxsdk Remove from build mingw Fix generating buildno.h svn path=/branches/Tree-restructure-test/; revision=49093
2 parents e614394 + ee353ad commit 96b27cd

File tree

2,385 files changed

+1065044
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,385 files changed

+1065044
-92
lines changed

‎Makefile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,7 @@ else
169169
endif
170170

171171
ifeq ($(ROS_AUTOMAKE),)
172-
ifeq ($(ARCH),i386)
173-
ROS_AUTOMAKE=makefile.auto
174-
else
175172
ROS_AUTOMAKE=makefile-$(ARCH).auto
176-
endif
177173
endif
178174

179175
all: $(ROS_AUTOMAKE)
@@ -423,7 +419,7 @@ $(TEMPORARY):
423419
endif
424420
endif
425421

426-
BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h
422+
BUILDNO_H = $(INTERMEDIATE_)sdk$(SEP)include$(SEP)reactos$(SEP)buildno.h
427423

428424
include sdk/libs/lib.mak
429425
include sdk/tools/tools.mak
@@ -432,9 +428,9 @@ include sdk/tools/tools.mak
432428
PREAUTO := \
433429
$(BIN2C_TARGET) \
434430
$(BIN2RES_TARGET) \
435-
# $(BUILDNO_H) \
436-
$(GENDIB_DIB_FILES) \
437-
$(NCI_SERVICE_FILES)
431+
$(BUILDNO_H) \
432+
$(NCI_SERVICE_FILES) \
433+
$(GENDIB_DIB_FILES)
438434

439435
ifeq ($(ARCH),powerpc)
440436
PREAUTO += $(OFW_INTERFACE_SERVICE_FILES) $(PPCMMU_TARGETS)
@@ -444,8 +440,7 @@ ifeq ($(ROS_BUILDENGINE),)
444440
ROS_BUILDENGINE=$(RBUILD_TARGET)
445441
endif
446442

447-
$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(PREAUTO)
448-
${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL)
443+
$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(BUILDNO_H)
449444
$(ECHO_RBUILD)
450445
$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw
451446

‎ReactOS-amd64.rbuild

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
3-
<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
3+
<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true">
44
<xi:include href="config-amd64.rbuild">
55
<xi:fallback>
66
<xi:include href="config-amd64.template.rbuild" />
@@ -18,6 +18,7 @@
1818
<define name="TARGET_amd64" host="true" />
1919

2020
<define name="USE_COMPILER_EXCEPTIONS" />
21+
<define name ="NO_UNDERSCORE_PREFIX" />
2122

2223
<property name="PLATFORM" value="PC"/>
2324
<property name="usewrc" value="false"/>
@@ -28,11 +29,13 @@
2829
<compilerflag>-ftracer</compilerflag>
2930
<compilerflag>-momit-leaf-frame-pointer</compilerflag>
3031
</if>
32+
<compilerflag>-fms-extensions</compilerflag>
3133
<compilerflag>-mpreferred-stack-boundary=4</compilerflag>
3234
<compilerflag compiler="midl">-m64 --win64</compilerflag>
3335
<!-- compilerflag compiler="cc,cxx">-gstabs+</compilerflag -->
3436
<!-- compilerflag compiler="as">-gstabs+</compilerflag -->
3537
<compilerflag>-U_X86_</compilerflag>
38+
<compilerflag>-UWIN32</compilerflag>
3639
<compilerflag>-Wno-format</compilerflag>
3740
</group>
3841

@@ -42,11 +45,31 @@
4245
<linkerflag>-section-alignment=0x1000</linkerflag>
4346
<linkerflag>--unique=.eh_frame</linkerflag>
4447
<linkerflag>-static</linkerflag>
48+
<linkerflag>--exclude-all-symbols</linkerflag>
4549
</group>
4650

4751
<if property="USERMODE" value="1">
4852
<directory name="base">
49-
<xi:include href="base/base.rbuild" />
53+
<directory name="applications">
54+
<xi:include href="base/applications/applications.rbuild" />
55+
</directory>
56+
<directory name="services">
57+
<xi:include href="base/services/services.rbuild" />
58+
</directory>
59+
<directory name="setup">
60+
<xi:include href="base/setup/setup.rbuild" />
61+
</directory>
62+
<directory name="shell">
63+
<directory name="cmd">
64+
<xi:include href="base/shell/cmd/cmd.rbuild" />
65+
</directory>
66+
<directory name="explorer-new">
67+
<xi:include href="base/shell/explorer-new/explorer.rbuild" />
68+
</directory>
69+
</directory>
70+
<directory name="system">
71+
<xi:include href="base/system/system.rbuild" />
72+
</directory>
5073
</directory>
5174
<directory name="dll">
5275
<xi:include href="dll/dll.rbuild" />

‎ReactOS-arm.rbuild

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
</xi:fallback>
88
</xi:include>
99

10-
<xi:include href="ReactOS-generic.rbuild" />
10+
<xi:include href="ReactOS-generic.rbuild" />
1111

12-
<!-- <define name="_M_ARM" /> Already defined by toolchain -->
12+
<!-- <define name="_M_ARM" /> Already defined by toolchain -->
1313
<define name="_ARM_" />
1414
<define name="__arm__" />
1515
<define name="TARGET_arm" host="true" />
1616

17-
<define name="USE_COMPILER_EXCEPTIONS" />
17+
<define name="USE_COMPILER_EXCEPTIONS" />
1818

19-
<property name="WINEBUILD_FLAGS" value="--kill-at"/>
19+
<property name="WINEBUILD_FLAGS" value="--kill-at"/>
2020

21-
<include>include/reactos/arm</include>
21+
<include>include/reactos/arm</include>
2222
2323
<if property="SARCH" value="versatile">
2424
<define name="BOARD_CONFIG_VERSATILE"/>
@@ -28,17 +28,18 @@
2828
<if property="OPTIMIZE" value="1">
2929
<compilerflag>-ftracer</compilerflag>
3030
</if>
31-
<compilerflag>-Wno-attributes</compilerflag>
32-
<compilerflag>-U_UNICODE</compilerflag>
33-
<compilerflag>-UUNICODE</compilerflag>
31+
<compilerflag>-fms-extensions</compilerflag>
32+
<compilerflag>-Wno-attributes</compilerflag>
33+
<compilerflag>-U_UNICODE</compilerflag>
34+
<compilerflag>-UUNICODE</compilerflag>
3435
</group>
3536

3637

3738
<define name="__MSVCRT__"/> <!-- DUBIOUS -->
3839

3940
<group linkerset="ld">
40-
<linkerflag>--strip-debug</linkerflag> <!-- INVESTIGATE -->
41-
<linkerflag>-static</linkerflag> <!-- INVESTIGATE -->
41+
<linkerflag>--strip-debug</linkerflag> <!-- INVESTIGATE -->
42+
<linkerflag>-static</linkerflag> <!-- INVESTIGATE -->
4243
<linkerflag>-file-alignment=0x1000</linkerflag>
4344
<linkerflag>-section-alignment=0x1000</linkerflag>
4445
</group>
@@ -52,7 +53,10 @@
5253
<directory name="drivers">
5354
<directory name="csq">
5455
<xi:include href="lib/drivers/csq/csq.rbuild" />
55-
</directory>
56+
</directory>
57+
</directory>
58+
<directory name="cportlib">
59+
<xi:include href="lib/cportlib/cportlib.rbuild" />
5660
</directory>
5761
<directory name="debugsup">
5862
<xi:include href="lib/debugsup/debugsup.rbuild" />
@@ -73,6 +77,9 @@
7377
<directory name="inflib">
7478
<xi:include href="lib/inflib/inflib.rbuild" />
7579
</directory>
80+
<directory name="newinflib">
81+
<xi:include href="lib/newinflib/inflib.rbuild" />
82+
</directory>
7683
<directory name="cmlib">
7784
<xi:include href="lib/cmlib/cmlib.rbuild" />
7885
</directory>
@@ -87,6 +94,9 @@
8794
<xi:include href="lib/sdk/crt/crt.rbuild" />
8895
<xi:include href="lib/sdk/crt/libcntpr.rbuild" />
8996
</directory>
97+
<directory name="ioevent">
98+
<xi:include href="lib/sdk/ioevent/ioevent.rbuild" />
99+
</directory>
90100
<directory name="nt">
91101
<xi:include href="lib/sdk/nt/nt.rbuild" />
92102
</directory>
@@ -111,17 +121,7 @@
111121
<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
112122
</directory>
113123
<directory name="hal">
114-
<directory name="halarm">
115-
<directory name="generic">
116-
<xi:include href="hal/halarm/generic/generic.rbuild" />
117-
</directory>
118-
<directory name="up">
119-
<xi:include href="hal/halarm/up/halup.rbuild" />
120-
</directory>
121-
</directory>
122-
<directory name="hal">
123-
<xi:include href="hal/hal/hal.rbuild" />
124-
</directory>
124+
<xi:include href="hal/hal.rbuild" />
125125
</directory>
126126
<directory name="boot">
127127
<xi:include href="boot/boot.rbuild" />
@@ -155,9 +155,9 @@
155155
</directory>
156156
<directory name="base">
157157
<directory name="system">
158-
<directory name="smss">
159-
<xi:include href="http://github.com/%3C/span%3E%3Cspan%20class="pl-en">base/system/smss/smss.rbuild" />
160-
</directory>
158+
<directory name="smss">
159+
<xi:include href="http://github.com/%3C/span%3E%3Cspan%20class="pl-en">base/system/smss/smss.rbuild" />
160+
</directory>
161161
</directory>
162162
</directory>
163163
</project>

‎ReactOS-generic.rbuild

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,31 +63,31 @@
6363
<define name="_SETUPAPI_VER">0x600</define>
6464
</if>
6565

66-
<include>.</include>
67-
<include>include</include>
68-
<include root="intermediate">include</include>
69-
<include>include/psdk</include>
70-
<include root="intermediate">include/psdk</include>
71-
<include>include/dxsdk</include>
72-
<include root="intermediate">include/dxsdk</include>
73-
<include>include/crt</include>
74-
<include compilerset="gcc">include/crt/mingw32</include>
75-
<include compilerset="msc">include/crt/msc</include>
76-
<include>include/ddk</include>
77-
<include>include/GL</include>
78-
<include>include/ndk</include>
79-
<include>include/reactos</include>
80-
<include root="intermediate">include/reactos</include>
81-
<include root="intermediate">include/reactos/mc</include>
82-
<include>include/reactos/libs</include>
83-
84-
<include host="true">include</include>
85-
<include host="true" root="intermediate">include</include>
86-
<include host="true">include/reactos</include>
87-
<include host="true">include/reactos/wine</include>
66+
<include>sdk/include</include>
67+
<include root="intermediate">sdk/include</include>
68+
<include>sdk/include/psdk</include>
69+
<include root="intermediate">sdk/include/psdk</include>
70+
<include>sdk/include/dxsdk</include>
71+
<include root="intermediate">sdk/include/dxsdk</include>
72+
<include>sdk/include/crt</include>
73+
<include compilerset="gcc">sdk/include/crt/mingw32</include>
74+
<include compilerset="msc">sdk/include/crt/msc</include>
75+
<include>sdk/include/ddk</include>
76+
<include>sdk/include/GL</include>
77+
<include>sdk/include/ndk</include>
78+
<include>sdk/include/reactos</include>
79+
<include root="intermediate">sdk/include/reactos</include>
80+
<include root="intermediate">sdk/include/reactos/mc</include>
81+
<include>sdk/include/reactos/libs</include>
82+
83+
<include host="true">sdk/include</include>
84+
<include host="true" root="intermediate">sdk/include</include>
85+
<include host="true">sdk/include/reactos</include>
86+
<include host="true">sdk/include/reactos/wine</include>
8887
8988
<group compilerset="gcc">
9089
<compilerflag>-Wall</compilerflag>
90+
<compilerflag>-Wno-char-subscripts</compilerflag>
9191
<compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag>
9292
</group>
9393

@@ -117,14 +117,9 @@
117117
</if>
118118

119119
<compilerflag>-fno-strict-aliasing</compilerflag>
120-
<compilerflag>-Wno-strict-aliasing</compilerflag>
121120
<compilerflag>-Wpointer-arith</compilerflag>
122121
<compilerflag>-Wno-multichar</compilerflag>
123-
<!--
124122
<compilerflag>-Wno-error=uninitialized</compilerflag>
125-
<compilerflag>-Wno-error=unused-function</compilerflag>
126-
<compilerflag>-Wno-error=write-strings</compilerflag>
127-
-->
128123
<!-- compilerflag>-H</compilerflag> enable this for header traces -->
129124
</group>
130125

‎ReactOS-i386.rbuild

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
3-
<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
3+
<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
44
<xi:include href="config.rbuild">
55
<xi:fallback>
66
<xi:include href="config.template.rbuild" />
@@ -24,9 +24,12 @@
2424
<compilerflag>-ftracer</compilerflag>
2525
<compilerflag>-momit-leaf-frame-pointer</compilerflag>
2626
</if>
27+
<compilerflag>-fms-extensions</compilerflag>
2728
<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
2829
<compilerflag compiler="midl">-m32 --win32</compilerflag>
2930
<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
31+
<compilerflag compiler="cc,cxx">-fno-set-stack-executable</compilerflag>
32+
<compilerflag compiler="cc,cxx">-fno-optimize-sibling-calls</compilerflag>
3033
<compilerflag compiler="as">-gstabs+</compilerflag>
3134
</group>
3235

‎baseaddress.rbuild

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<group xmlns:xi="http://www.w3.org/2001/XInclude">
44
<property name="BASEADDRESS_REGTESTS" value="0x07000000" />
55
<property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" />
6+
<property name="BASEADDRESS_FAULTREP" value="0x107A0000" />
67
<property name="BASEADDRESS_QMGRPRXY" value="0x1f710000" />
78
<property name="BASEADDRESS_CRYPTDLG" value="0x209c0000" />
89
<property name="BASEADDRESS_COMCAT" value="0x20a50000" />
@@ -23,13 +24,16 @@
2324
<property name="BASEADDRESS_PSTOREC" value="0x513d0000" />
2425
<property name="BASEADDRESS_LPK" value="0x516c0000" />
2526
<property name="BASEADDRESS_MSGSM32ACM" value="0x56db0000" />
27+
<property name="BASEADDRESS_MSDVBNP" value="0x58280000" />
2628
<property name="BASEADDRESS_MSG711ACM" value="0x584f0000" />
2729
<property name="BASEADDRESS_IMAADP32ACM" value="0x585e0000" />
30+
<property name="BASEADDRESS_BDAPLGIN" value="0x58600000" />
2831
<property name="BASEADDRESS_TELEPHON" value="0x58750000" />
2932
<property name="BASEADDRESS_PWRCFG" value="0x587e0000" />
3033
<property name="BASEADDRESS_MMSYS" value="0x588a0000" />
3134
<property name="BASEADDRESS_JOY" value="0x589b0000" />
3235
<property name="BASEADDRESS_QMGR" value="0x59620000" />
36+
<property name="BASEADDRESS_MSVIDCTL" value="0x59660000" />
3337
<property name="BASEADDRESS_UXTHEME" value="0x5ad70000" />
3438
<property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" />
3539
<property name="BASEADDRESS_UNTFS" value="0x5b340000" />
@@ -116,6 +120,7 @@
116120
<property name="BASEADDRESS_CARDS" value="0x701a0000" />
117121
<property name="BASEADDRESS_WININET" value="0x70200000" />
118122
<property name="BASEADDRESS_WINHTTP" value="0x70c60000" />
123+
<property name="BASEADDRESS_BATT" value="0x70cb0000" />
119124
<property name="BASEADDRESS_AMSTREAM" value="0x71030000" />
120125
<property name="BASEADDRESS_ACLUI" value="0x71550000" />
121126
<property name="BASEADDRESS_DHCPCSVC" value="0x71650000" />
@@ -128,6 +133,7 @@
128133
<property name="BASEADDRESS_OLESVR32" value="0x71dd0000" />
129134
<property name="BASEADDRESS_OLECLI32" value="0x71df0000" />
130135
<property name="BASEADDRESS_OLETHK32" value="0x71e10000" />
136+
<property name="BASEADDRESS_NETEVENT" value="0x71e70000" />
131137
<property name="BASEADDRESS_DPLAY" value="0x71e80000" />
132138
<property name="BASEADDRESS_SECURITY" value="0x71f10000" />
133139
<property name="BASEADDRESS_MSSIGN32" value="0x720c0000" />
@@ -182,8 +188,8 @@
182188
<property name="BASEADDRESS_RPCRT4" value="0x76000000" />
183189
<property name="BASEADDRESS_SHLWAPI" value="0x76100000" />
184190
<property name="BASEADDRESS_INETCOMM" value="0x76140000" />
185-
<property name="BASEADDRESS_COMCTL32" value="0x76160000" />
186-
<property name="BASEADDRESS_COMDLG32" value="0x76210000" />
191+
<property name="BASEADDRESS_COMCTL32" value="0x76170000" />
192+
<property name="BASEADDRESS_COMDLG32" value="0x76230000" />
187193
<property name="BASEADDRESS_WINSTA" value="0x762f0000" />
188194
<property name="BASEADDRESS_IMM32" value="0x76320000" />
189195
<property name="BASEADDRESS_D3D8THK" value="0x76340000" />
@@ -197,15 +203,15 @@
197203
<property name="BASEADDRESS_WAVEMAP" value="0x76610000" />
198204
<property name="BASEADDRESS_MPR" value="0x76620000" />
199205
<property name="BASEADDRESS_MSHTML" value="0x76650000" />
200-
<property name="BASEADDRESS_ODBC32" value="0x76660000" />
201-
<property name="BASEADDRESS_SETUPAPI" value="0x76660000" />
202-
<property name="BASEADDRESS_CRYPTDLL" value="0x76740000" />
203-
<property name="BASEADDRESS_SHFOLDER" value="0x76760000" />
204-
<property name="BASEADDRESS_NTDSAPI" value="0x76780000" />
205-
<property name="BASEADDRESS_NTMARTA" value="0x768a0000" />
206-
<property name="BASEADDRESS_RASDLG" value="0x768d0000" />
207-
<property name="BASEADDRESS_GDIPLUS" value="0x76a00000" />
208-
<property name="BASEADDRESS_ATL" value="0x76a80000" />
206+
<property name="BASEADDRESS_ODBC32" value="0x76710000" />
207+
<property name="BASEADDRESS_SETUPAPI" value="0x76730000" />
208+
<property name="BASEADDRESS_CRYPTDLL" value="0x768f0000" />
209+
<property name="BASEADDRESS_SHFOLDER" value="0x76900000" />
210+
<property name="BASEADDRESS_NTDSAPI" value="0x76910000" />
211+
<property name="BASEADDRESS_NTMARTA" value="0x76920000" />
212+
<property name="BASEADDRESS_RASDLG" value="0x76930000" />
213+
<property name="BASEADDRESS_GDIPLUS" value="0x76a70000" />
214+
<property name="BASEADDRESS_ATL" value="0x76ac0000" />
209215
<property name="BASEADDRESS_SFC" value="0x76b50000" />
210216
<property name="BASEADDRESS_CREDUI" value="0x76bf0000" />
211217
<property name="BASEADDRESS_SFC_OS" value="0x76c10000" />
@@ -236,7 +242,7 @@
236242
<property name="BASEADDRESS_WSHIRDA" value="0x777f0000" />
237243
<property name="BASEADDRESS_VERSION" value="0x77a40000" />
238244
<property name="BASEADDRESS_OLE32" value="0x77a50000" />
239-
<property name="BASEADDRESS_OLEPRO32" value="0x77b10000" />
245+
<property name="BASEADDRESS_OLEPRO32" value="0x77b20000" />
240246
<property name="BASEADDRESS_ACTIVEDS" value="0x77cb0000" />
241247
<property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" />
242248
<property name="BASEADDRESS_USER32" value="0x77e50000" />

0 commit comments

Comments
 (0)