update for HEAD-2003091401

[reactos.git] / lib / user32 / Makefile

diff --git a/lib/user32/Makefile b/lib/user32/Makefile
index 8bf5b11..8cceb6f 100644 (file)
--- a/lib/user32/Makefile
+++ b/lib/user32/Makefile
@@ -8,22 +8,31 @@ TARGET_NAME = user32
 
 TARGET_BASE = 0x77e70000
 
-TARGET_SDKLIBS = ntdll.a kernel32.a gdi32.a
+TARGET_SDKLIBS = ntdll.a kernel32.a gdi32.a rosrtl.a
 
-TARGET_CFLAGS = -I./include -DUNICODE -Wall -Werror
+TARGET_CFLAGS = \
+ -I./include \
+ -DUNICODE \
+ -Wall \
+ -Werror \
+ -fno-builtin
 
-TARGET_OBJECTS = $(TARGET_NAME).o
+# require os code to explicitly request A/W version of structs/functions
+TARGET_CFLAGS += -D_DISABLE_TIDENTS
 
-TARGET_CLEAN = misc/*.o windows/*.o
+TARGET_LFLAGS = -nostartfiles -nostdlib
 
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
+TARGET_RCFLAGS = --include-dir ./include
 
 CONTROLS_OBJECTS = \
-       controls/combobox.o \
+       controls/combo.o \
+       controls/edit.o \
+       controls/icontitle.o \
        controls/listbox.o \
-       controls/scrollbar.o
+       controls/scrollbar.o \
+       controls/static.o \
+       controls/button.o \
+       controls/regcontrol.o
 
 MISC_OBJECTS = \
        misc/dde.o \
@@ -38,9 +47,11 @@ MISC_OBJECTS = \
        misc/winsta.o \
        misc/resources.o \
        misc/object.o \
-       misc/timer.o
+       misc/timer.o \
+       misc/strpool.o
 
 WINDOWS_OBJECTS = \
+       windows/caret.o \
        windows/class.o \
        windows/message.o \
        windows/window.o \
@@ -59,18 +70,25 @@ WINDOWS_OBJECTS = \
        windows/mdi.o \
        windows/menu.o \
        windows/messagebox.o \
-       windows/nonclient.o \
        windows/paint.o \
        windows/prop.o \
        windows/rect.o \
-       windows/text.o
+       windows/text.o \
+       windows/winpos.o
 
-OBJECTS = \
+TARGET_OBJECTS = \
   $(MISC_OBJECTS) \
   $(WINDOWS_OBJECTS) \
   $(CONTROLS_OBJECTS)
 
-$(TARGET_NAME).o: $(OBJECTS)
-       $(LD) -r $(OBJECTS) -o $(TARGET_NAME).o
+DEP_OBJECTS = $(TARGET_OBJECTS)
+
+DEP_EXCLUDE_FILTER = misc/win32k.%
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+include $(TOOLS_PATH)/depend.mk
 
 # EOF