Use FreeType DLL

svn path=/trunk/; revision=4466

reactos/Makefile

@@ -29,7 +29,7 @@ BUS = acpi isapnp pci
 # User mode libraries
 # advapi32 crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll ole32
 # oleaut32 psapi rpcrt4 secur32 shell32 user32 version ws2help ws2_32 wsock32 wshirda
-DLLS = advapi32 crtdll fmifs gdi32 kernel32 packet msafd msvcrt ntdll \
+DLLS = advapi32 crtdll fmifs freetype gdi32 kernel32 packet msafd msvcrt ntdll \
        secur32 user32 version winedbgc ws2help ws2_32 wshirda zlib #winmm 
 
 SUBSYS = smss win32k csrss ntvdm

reactos/bootcd.bat

@@ -97,6 +97,7 @@ copy /Y drivers\storage\scsiport\scsiport.sys %BOOTCD_DIR%\disk\install
 copy /Y lib\advapi32\advapi32.dll %BOOTCD_DIR%\disk\install
 copy /Y lib\crtdll\crtdll.dll %BOOTCD_DIR%\disk\install
 copy /Y lib\fmifs\fmifs.dll %BOOTCD_DIR%\disk\install
+copy /Y lib\freetype\freetype.dll %BOOTCD_DIR%\disk\install
 copy /Y lib\gdi32\gdi32.dll %BOOTCD_DIR%\disk\install
 copy /Y lib\kernel32\kernel32.dll %BOOTCD_DIR%\disk\install
 copy /Y lib\msafd\msafd.dll %BOOTCD_DIR%\disk\install

reactos/bootdata/txtsetup.sif

@@ -57,6 +57,7 @@ scsiport.sys = 3
 advapi32.dll = 2
 crtdll.dll   = 2
 fmifs.dll    = 2
+freetype.dll = 2
 gdi32.dll    = 2
 kernel32.dll = 2
 msafd.dll    = 2

reactos/install.bat

@@ -74,6 +74,7 @@ copy services\rpcss\rpcss.exe %ROS_INSTALL%\system32
 copy lib\advapi32\advapi32.dll %ROS_INSTALL%\system32
 copy lib\crtdll\crtdll.dll %ROS_INSTALL%\system32
 copy lib\fmifs\fmifs.dll %ROS_INSTALL%\system32
+copy lib\freetype\freetype.dll %ROS_INSTALL%\system32
 copy lib\gdi32\gdi32.dll %ROS_INSTALL%\system32
 copy lib\iphlpapi\iphlpapi.dll %ROS_INSTALL%\system32
 copy lib\kernel32\kernel32.dll %ROS_INSTALL%\system32

reactos/subsys/win32k/main/dllmain.c

@@ -1,4 +1,4 @@
-/* $Id: dllmain.c,v 1.32 2003/03/28 16:20:50 gvg Exp $
+/* $Id: dllmain.c,v 1.33 2003/04/01 08:43:46 gvg Exp $
  *
  *  Entry Point for win32k.sys
  */
@@ -107,7 +107,9 @@ W32kInitialize (VOID)
   InitGdiObjectHandleTable ();
 
   // Create surface used to draw the internal font onto
+#ifdef TODO
   CreateCellCharSurface();
+#endif
 
   // Initialize FreeType library
   if(!InitFontSupport()) return FALSE;

reactos/subsys/win32k/makefile

@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.59 2003/03/20 03:05:03 mtempel Exp $
+# $Id: makefile,v 1.60 2003/04/01 08:43:46 gvg Exp $
 
 PATH_TO_TOP = ../..
 
@@ -10,6 +10,10 @@ TARGET_BASE = 0x0
 
 TARGET_ENTRY = _DllMain@8
 
+TARGET_DDKLIBS = freetype.a
+
+FREETYPE_DIR = $(PATH_TO_TOP)/lib/freetype
+
 include $(PATH_TO_TOP)/config
 
 ifeq ($(DBG), 1)
@@ -18,7 +22,9 @@ else
 CFLAGS_DBG :=
 endif
 
-TARGET_CFLAGS = $(CFLAGS_DBG) -I$(PATH_TO_TOP)/ntoskrnl/include -DUNICODE -Wall
+TARGET_CFLAGS = $(CFLAGS_DBG) -I$(PATH_TO_TOP)/ntoskrnl/include -I$(FREETYPE_DIR)/include -DUNICODE -Wall
+
+TARGET_LFLAGS = $(PATH_TO_TOP)/dk/nkm/lib/freetype.a
 
 ENG_OBJECTS= eng/debug.o eng/mem.o eng/brush.o eng/bitblt.o eng/clip.o \
     eng/copybits.o eng/device.o eng/handle.o eng/lineto.o eng/paint.o \
@@ -63,7 +69,7 @@ STUBS_OBJECTS = stubs/stubs.o
 TARGET_OBJECTS = \
   $(ENG_OBJECTS) $(MAIN_OBJECTS) $(MISC_OBJECTS) $(LDR_OBJECTS) \
   $(NTUSER_OBJECTS) $(OBJECTS_OBJECTS) $(STUBS_OBJECTS) \
-  $(MATH_OBJECTS) $(FLOAT_OBJECTS) $(FREETYPE_OBJECTS) $(DIB_OBJECTS)
+  $(MATH_OBJECTS) $(FLOAT_OBJECTS) $(DIB_OBJECTS)
 
 TARGET_CLEAN = $(DEP_FILES) \
   dib/*.o \
@@ -83,7 +89,7 @@ include $(TOOLS_PATH)/helper.mk
 # Automatic dependency tracking
 DEP_OBJECTS := $(TARGET_OBJECTS)
 DEP_EXCLUDE_FILTER := main/svctabm.d
-include $(PATH_TO_TOP)/tools/depend.mk
+#include $(PATH_TO_TOP)/tools/depend.mk
 
 main/svctabm.o: main/svctab.c
 

reactos/subsys/win32k/objects/text.c

@@ -8,7 +8,8 @@
 #include <win32k/dc.h>
 #include <win32k/text.h>
 #include <win32k/kapi.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #include "../eng/handle.h"