Remove freetype dll from build, build ftfd instead, the freetype font driver that...

svn path=/trunk/; revision=39968

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index dec2e19..67f62e4 100644 (file)
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -111,7 +111,6 @@ base\system\smss\smss.exe                           1
 
 
 ; Dynamic Link Libraries
-dll\3rdparty\freetype\freetype.dll                  1
 dll\3rdparty\mesa32\mesa32.dll                      1
 dll\3rdparty\libjpeg\libjpeg.dll                    1
 dll\3rdparty\libxslt\libxslt.dll                    1
@@ -474,6 +473,7 @@ drivers\video\displays\framebuf\framebuf.dll        1
 drivers\video\miniport\vga\vgamp.sys                2
 drivers\video\miniport\vbe\vbemp.sys                2
 drivers\video\videoprt\videoprt.sys                 2
+drivers\video\font\ftfd\ftfd.dll                   1
 
 drivers\wdm\audio\filters\kmixer\kmixer.sys         2
 drivers\wdm\audio\sysaudio\sysaudio.sys             2

diff --git a/reactos/dll/3rdparty/3rdparty.rbuild b/reactos/dll/3rdparty/3rdparty.rbuild
index 803151c..e2d58af 100644 (file)
--- a/reactos/dll/3rdparty/3rdparty.rbuild
+++ b/reactos/dll/3rdparty/3rdparty.rbuild
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-       <directory name="freetype">
-               <xi:include href="freetype/freetype.rbuild" />
-       </directory>
        <directory name="mesa32">
                <xi:include href="mesa32/mesa32.rbuild" />
        </directory>
@@ -19,4 +16,4 @@
                </directory>
        </if>
 </group>
-       
\ No newline at end of file
+       

diff --git a/reactos/drivers/video/font/directory.rbuild b/reactos/drivers/video/font/directory.rbuild
index 1d59fcf..f7e7f3c 100644 (file)
--- a/reactos/drivers/video/font/directory.rbuild
+++ b/reactos/drivers/video/font/directory.rbuild
@@ -4,5 +4,8 @@
        <directory name="bmfd">
                <xi:include href="bmfd/bmfd.rbuild" />
        </directory>
+       <directory name="ftfd">
+               <xi:include href="ftfd/ftfd.rbuild" />
+       </directory>
 </group>
 

diff --git a/reactos/lib/3rdparty/3rdparty.rbuild b/reactos/lib/3rdparty/3rdparty.rbuild
index 1804e05..bd62325 100644 (file)
--- a/reactos/lib/3rdparty/3rdparty.rbuild
+++ b/reactos/lib/3rdparty/3rdparty.rbuild
@@ -10,6 +10,9 @@
        <directory name="expat">
                <xi:include href="expat/expat.rbuild" />
        </directory>
+       <directory name="freetype">
+               <xi:include href="freetype/freetype.rbuild" />
+       </directory>
        <directory name="icu4ros">
                <xi:include href="icu4ros/icu4ros.rbuild" />
        </directory>

diff --git a/reactos/lib/3rdparty/freetype/freetype.rbuild b/reactos/lib/3rdparty/freetype/freetype.rbuild
index 4b0df90..8836b97 100644 (file)
--- a/reactos/lib/3rdparty/freetype/freetype.rbuild
+++ b/reactos/lib/3rdparty/freetype/freetype.rbuild
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="freetype" type="kernelmodedll" entrypoint="0" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" allowwarnings="true" crt="libcntpr">
-       <importlibrary definition="freetype.def" />
-       <include base="freetype">include</include>
+<module name="freetype2" type="staticlibrary" allowwarnings="true">
+       <include base="freetype2">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="__NTDRIVER__" />
        <define name="__NO_CTYPE_INLINES" />
@@ -13,8 +12,6 @@
        <if property="NSWPAT" value="1">
                <define name="TT_CONFIG_OPTION_BYTECODE_INTERPRETER" />
        </if>
-       <library>win32k</library>
-       <library>libcntpr</library>
        <if property="ARCH" value="i386">
                <directory name="i386">
                        <file>setjmplongjmp.s</file>
@@ -104,7 +101,4 @@
                        <file>winfnt.c</file>
                </directory>
        </directory>
-       <file>rosglue.c</file>
-       <file>sprintf.c</file>
-       <file>freetype.rc</file>
 </module>

diff --git a/reactos/subsystems/win32/win32k/win32k.rbuild b/reactos/subsystems/win32/win32k/win32k.rbuild
index 64ad9df..5f1d208 100644 (file)
--- a/reactos/subsystems/win32/win32k/win32k.rbuild
+++ b/reactos/subsystems/win32/win32k/win32k.rbuild
@@ -197,7 +197,7 @@
        <library>pseh</library>
        <library>ntoskrnl</library>
        <library>hal</library>
-       <library>freetype</library>
+       <library>ftfd</library>
        <library>dxguid</library>
        <file>win32k.rc</file>
 </module>