branch update for HEAD-2003050101

[reactos.git] / subsys / win32k / makefile

diff --git a/subsys/win32k/makefile b/subsys/win32k/makefile
index 7584dee..d9cc199 100644 (file)
--- a/subsys/win32k/makefile
+++ b/subsys/win32k/makefile
@@ -2,7 +2,7 @@
 
 PATH_TO_TOP = ../..
 
-TARGET_TYPE = export_driver
+TARGET_TYPE = subsystem
 
 TARGET_NAME = win32k
 
@@ -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,20 +22,29 @@ 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 \
-    eng/palette.o eng/surface.o eng/xlate.o eng/transblt.o eng/mouse.o
+    eng/palette.o eng/surface.o eng/xlate.o eng/transblt.o eng/mouse.o \
+    eng/misc.o
+
 MAIN_OBJECTS = main/dllmain.o main/svctabm.o
+
 MISC_OBJECTS = misc/driver.o misc/error.o misc/math.o misc/object.o
+
 LDR_OBJECTS = ldr/loader.o
+
 NTUSER_OBJECTS = ntuser/class.o ntuser/guicheck.o ntuser/hook.o \
                  ntuser/message.o ntuser/msgqueue.o ntuser/stubs.o \
                  ntuser/userobj.o ntuser/window.o ntuser/winsta.o \
                 ntuser/input.o ntuser/keyboard.o ntuser/callback.o \
                 ntuser/winpos.o ntuser/painting.o ntuser/metric.o \
-                ntuser/windc.o ntuser/prop.o ntuser/scrollbar.o
+                ntuser/windc.o ntuser/prop.o ntuser/scrollbar.o \
+                ntuser/timer.o
+
 OBJECTS_OBJECTS = objects/bitmaps.o objects/brush.o objects/cliprgn.o  \
                   objects/color.o objects/coord.o objects/dc.o  \
                   objects/fillshap.o objects/gdiobj.o objects/icm.o  \
@@ -39,8 +52,10 @@ OBJECTS_OBJECTS = objects/bitmaps.o objects/brush.o objects/cliprgn.o  \
                   objects/path.o objects/pen.o objects/print.o  \
                   objects/region.o objects/text.o objects/wingl.o \
                   objects/bezier.o objects/objconv.o objects/dib.o \
-                 objects/palette.o objects/rect.o
-DIB_OBJECTS = dib/dib1bpp.o dib/dib4bpp.o dib/dib24bpp.o
+                 objects/palette.o objects/rect.o objects/polyfill.o
+
+DIB_OBJECTS = dib/dib.o dib/dib1bpp.o dib/dib4bpp.o dib/dib8bpp.o dib/dib16bpp.o \
+              dib/dib24bpp.o dib/dib32bpp.o
 FREETYPE_OBJECTS = freetype/ctype.o freetype/grfont.o \
                freetype/src/base/ftsystem.o freetype/src/base/ftdebug.o \
                freetype/src/base/ftinit.o freetype/src/base/ftbase.o \
@@ -55,7 +70,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 \
@@ -75,7 +90,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