[YAROTOWS] Reintegrate the branch. For a brighter future.

[reactos.git] / reactos / subsystems / win32 / win32k / win32k.rbuild

diff --git a/reactos/subsystems/win32/win32k/win32k.rbuild b/reactos/subsystems/win32/win32k/win32k.rbuild
index 5ccf818..0950f08 100644 (file)
--- a/reactos/subsystems/win32/win32k/win32k.rbuild
+++ b/reactos/subsystems/win32/win32k/win32k.rbuild
@@ -1,10 +1,17 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="win32k_base" type="objectlibrary" allowwarnings="true">
-       <include base="win32k_base">.</include>
-       <include base="win32k_base">include</include>
-       <include base="win32k_base" root="intermediate">.</include>
+<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" crt="libcntpr">
+       <importlibrary definition="win32k.pspec" />
+       <library>pseh</library>
+       <library>ntoskrnl</library>
+       <library>hal</library>
+       <library>ftfd</library>
+       <library>dxguid</library>
+       <file>win32k.rc</file>
+       <include base="win32k">.</include>
+       <include base="win32k">include</include>
+       <include base="win32k" root="intermediate">.</include>
        <include base="ntoskrnl">include</include>
        <include base="freetype">include</include>
        <include base="ReactOS">include/reactos/subsys</include>
@@ -13,9 +20,7 @@
        <compilerflag compilerset="msc">/wd4276</compilerflag>
        <define name="LANGPACK" />
        <define name="_WIN32K_" />
-       <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
        <pch>pch.h</pch>
-       -->
 
        <directory name="dib" root="intermediate">
                <file>dib8gen.c</file>
@@ -33,6 +38,7 @@
                <file>dib.c</file>
                <file>floodfill.c</file>
                <file>stretchblt.c</file>
+               <file>alphablend.c</file>
 
                <if property="ARCH" value="i386">
                        <directory name="i386">
@@ -64,13 +70,16 @@
                        </directory>
                </if>
                <file>gradient.c</file>
+               <file>ldevobj.c</file>
                <file>lineto.c</file>
                <file>mapping.c</file>
                <file>mem.c</file>
                <file>engmisc.c</file>
                <file>mouse.c</file>
                <file>paint.c</file>
+               <file>pdevobj.c</file>
                <file>perfcnt.c</file>
+               <file>rlecomp.c</file>
                <file>semaphor.c</file>
                <file>sort.c</file>
                <file>string.c</file>
@@ -80,9 +89,6 @@
                <file>engwindow.c</file>
                <file>xlate.c</file>
        </directory>
-       <directory name="ldr">
-               <file>loader.c</file>
-       </directory>
        <directory name="main">
                <file>dllmain.c</file>
        </directory>
@@ -198,18 +204,5 @@
                <file>stubs.c</file>
                <file>umpdstubs.c</file>
        </directory>
-
-       <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-       <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag>
-</module>
-<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" crt="libcntpr">
-       <importlibrary definition="win32k.pspec" />
-       <library>win32k_base</library>
-       <library>pseh</library>
-       <library>ntoskrnl</library>
-       <library>hal</library>
-       <library>ftfd</library>
-       <library>dxguid</library>
-       <file>win32k.rc</file>
 </module>
 </group>