branch update for HEAD-2003091401

[reactos.git] / lib / gdi32 / makefile

diff --git a/lib/gdi32/makefile b/lib/gdi32/makefile
index 78a1f62..4d75fc4 100644 (file)
--- a/lib/gdi32/makefile
+++ b/lib/gdi32/makefile
@@ -8,29 +8,40 @@ TARGET_NAME = gdi32
 
 TARGET_BASE = 0x77ed0000
 
+TARGET_SDKLIBS = rosrtl.a ntdll.a advapi32.a kernel32.a
+
 TARGET_CFLAGS = \
  -I./include \
+ -DUNICODE \
  -Wall \
  -Werror \
  -fno-builtin
 
-TARGET_LFLAGS = -nostartfiles -nostdlib
+# require os code to explicitly request A/W version of structs/functions
+TARGET_CFLAGS += -D_DISABLE_TIDENTS
 
-TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a
+TARGET_LFLAGS = -nostartfiles -nostdlib
 
 MAIN_OBJECTS = main/dllmain.o
 
-MISC_OBJECTS = misc/stubs.o misc/stubsa.o misc/stubsw.o misc/win32k.o
+MISC_OBJECTS = \
+ misc/heap.o \
+ misc/stubs.o \
+ misc/stubsa.o \
+ misc/stubsw.o \
+ misc/wingl.o \
+ misc/win32k.o
 
 OBJECTS_OBJECTS = \
+ objects/bitblt.o \
+ objects/brush.o \
+ objects/clip.o \
  objects/dc.o \
+ objects/fillshap.o \
  objects/line.o \
  objects/pen.o \
- objects/bitblt.o \
- objects/text.o \
  objects/region.o \
- objects/brush.o \
- objects/fillshap.o
+ objects/text.o
 
 TARGET_OBJECTS = $(MAIN_OBJECTS) $(MISC_OBJECTS) $(OBJECTS_OBJECTS)