Sync to trunk (r44371)

[reactos.git] / reactos / ReactOS-amd64.rbuild

diff --git a/reactos/ReactOS-amd64.rbuild b/reactos/ReactOS-amd64.rbuild
index f33c20f..a733993 100644 (file)
--- a/reactos/ReactOS-amd64.rbuild
+++ b/reactos/ReactOS-amd64.rbuild
@@ -41,6 +41,7 @@
 
        <compilerflag>-U_X86_</compilerflag>
        <compilerflag>-mpreferred-stack-boundary=4</compilerflag>
+       <compilerflag compiler="midl">-m64 --win64</compilerflag>
        <compilerflag>-fno-strict-aliasing</compilerflag>
        <compilerflag>-Wno-strict-aliasing</compilerflag>
        <compilerflag>-Wpointer-arith</compilerflag>
@@ -49,11 +50,11 @@
        <!-- compilerflag>-H</compilerflag>    enable this for header traces -->
 
        <group linkerset="ld">
-               <linkerflag>-disable-stdcall-fixup</linkerflag>
-               <linkerflag>-static</linkerflag>
-               <linkerflag>--unique=.eh_frame</linkerflag>
-               <linkerflag>-file-alignment=0x1000</linkerflag>
-               <linkerflag>-section-alignment=0x1000</linkerflag>
+       <linkerflag>-disable-stdcall-fixup</linkerflag>
+       <linkerflag>-static</linkerflag>
+       <linkerflag>--unique=.eh_frame</linkerflag>
+       <linkerflag>-file-alignment=0x1000</linkerflag>
+       <linkerflag>-section-alignment=0x1000</linkerflag>
        </group>
 
 <!-- Here starts <xi:include href="ReactOS-generic.rbuild" /> -->
@@ -176,9 +177,9 @@
                        <xi:include href="drivers/ksfilter/directory.rbuild" />
                </directory>
 
-               <!-- directory name="multimedia">
+               <directory name="multimedia">
                        <xi:include href="drivers/multimedia/directory.rbuild" />
-               </directory -->
+               </directory >
 
                <directory name="network">
                        <xi:include href="drivers/network/directory.rbuild" />
@@ -193,9 +194,9 @@
                        <xi:include href="drivers/setup/directory.rbuild" />
                </directory>
                <directory name="storage">
-            <xi:include href="drivers/storage/directory.rbuild" />
+                               <xi:include href="drivers/storage/directory.rbuild" />
                </directory>
-               <directory name="usb">
+               <directory name="usb">  
                        <xi:include href="drivers/usb/directory.rbuild" />
                </directory>
                <directory name="video">
@@ -225,9 +226,11 @@
                        <directory name="bzip2">
                                <xi:include href="lib/3rdparty/bzip2/bzip2.rbuild" />
                        </directory>
+                       <if property="USERMODE" value="1">
                        <directory name="cardlib">
                                <xi:include href="lib/3rdparty/cardlib/cardlib.rbuild" />
                        </directory>
+                       </if>
                        <directory name="expat">
                                <xi:include href="lib/3rdparty/expat/expat.rbuild" />
                        </directory>
@@ -256,6 +259,11 @@
                                <xi:include href="lib/3rdparty/zlib/zlib.rbuild" />
                        </directory>
                </directory>
+               <if property="USERMODE" value="1">
+               <directory name="atl">
+                       <xi:include href="lib/atl/atl.rbuild" />
+               </directory>
+               </if>
                <directory name="sdk">
                        <xi:include href="lib/sdk/sdk.rbuild" />
                </directory>