X-Git-Url: http://git.jankratochvil.net/?p=reactos.git;a=blobdiff_plain;f=ntoskrnl%2FMakefile;fp=ntoskrnl%2FMakefile;h=1616e67f5b50483027b62f52aa1b330c8ee2c0bf;hp=6e719f39e33b226929c4df2c17bf3439f0c99234;hb=7c0cf90e3b750f1f0dc83b2eec9e5c68a512c30f;hpb=ee8b63255465d8c28be3e7bd11628015708fc1ab diff --git a/ntoskrnl/Makefile b/ntoskrnl/Makefile index 6e719f3..1616e67 100644 --- a/ntoskrnl/Makefile +++ b/ntoskrnl/Makefile @@ -40,6 +40,12 @@ ASFLAGS += -I./include -I$(SDK_PATH_INC) CFLAGS += -I./include -I$(SDK_PATH_INC) -D__NTOSKRNL__ $(CFLAGS_DBG) -Wall -Werror endif +# ASFLAGS += -D__USE_W32API -D_NTOSKRNL_ +# CFLAGS += -D__USE_W32API -D_NTOSKRNL_ + +# require os code to explicitly request A/W version of structs/functions +CFLAGS += -D_DISABLE_TIDENTS + # # Build configuration # @@ -89,16 +95,11 @@ OBJECTS_RTL = \ rtl/error.o \ rtl/handle.o \ rtl/largeint.o \ - rtl/math.o \ rtl/mem.o \ - rtl/memchr.o \ - rtl/memcpy.o \ - rtl/memmove.o \ - rtl/memset.o \ rtl/message.o \ rtl/nls.o \ rtl/purecall.o \ - rtl/qsort.o \ + rtl/random.o \ rtl/regio.o \ rtl/sprintf.o \ rtl/stdlib.o \ @@ -108,7 +109,6 @@ OBJECTS_RTL = \ rtl/timezone.o \ rtl/unicode.o \ rtl/wstring.o \ - rtl/memcmp.o \ rtl/capture.o OBJECTS_RTL := $(filter-out $(RTL_EXCLUDE_FILTER), $(OBJECTS_RTL)) @@ -198,6 +198,7 @@ OBJECTS_IO = \ io/pnproot.o \ io/process.o \ io/queue.o \ + io/rawfs.o \ io/resource.o \ io/rw.o \ io/share.o \ @@ -271,6 +272,7 @@ OBJECTS_FS = \ OBJECTS_SE = \ se/access.o \ se/acl.o \ + se/audit.o \ se/lsa.o \ se/luid.o \ se/priv.o \ @@ -319,9 +321,6 @@ OBJECTS_LPC = \ lpc/reply.o \ lpc/send.o -# Nation Language Support Library (Nls) -OBJECTS_NLS = nls/nls.o - # Power Management (Po) OBJECTS_PO = po/power.o @@ -341,6 +340,10 @@ OBJECTS_KD = \ kd/gdbstub.o \ kd/mda.o +# Boot video (Inbv) +OBJECTS_INBV = \ + inbv/inbv.o + DEP_OBJECTS := $(OBJECTS_NT) $(OBJECTS_MM) $(OBJECTS_ARCH) \ $(OBJECTS_IO) $(OBJECTS_KE) $(OBJECTS_OB) \ $(OBJECTS_PS) $(OBJECTS_EX) $(OBJECTS_CC) $(OBJECTS_FS) $(OBJECTS_SE) \ @@ -454,12 +457,6 @@ $(OBJECTS_PATH)/lpc.o: $(OBJECTS_LPC) -o $(OBJECTS_PATH)/lpc.o \ $(OBJECTS_LPC) -$(OBJECTS_PATH)/nls.o: $(OBJECTS_NLS) - $(LD) \ - -r \ - -o $(OBJECTS_PATH)/nls.o \ - $(OBJECTS_NLS) - $(OBJECTS_PATH)/nt.o: $(OBJECTS_NT) $(LD) \ -r \ @@ -484,6 +481,12 @@ $(OBJECTS_PATH)/kd.o: $(OBJECTS_KD) -o $(OBJECTS_PATH)/kd.o \ $(OBJECTS_KD) +$(OBJECTS_PATH)/inbv.o: $(OBJECTS_INBV) + $(LD) \ + -r \ + -o $(OBJECTS_PATH)/inbv.o \ + $(OBJECTS_INBV) + # Note: arch.o MUST be the first file!!! OBJECTS := \ $(OBJECTS_PATH)/arch.o \ @@ -498,17 +501,17 @@ OBJECTS := \ $(OBJECTS_PATH)/kd.o \ $(OBJECTS_PATH)/ldr.o \ $(OBJECTS_PATH)/mm.o \ - $(OBJECTS_PATH)/nls.o \ $(OBJECTS_PATH)/nt.o \ $(OBJECTS_PATH)/ob.o \ $(OBJECTS_PATH)/po.o \ $(OBJECTS_PATH)/ps.o \ $(OBJECTS_PATH)/rtl.o \ $(OBJECTS_PATH)/se.o \ + $(OBJECTS_PATH)/inbv.o \ $(OBJECTS_RESOURCE) -$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) +$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a $(CC) \ -Wl,-T,ntoskrnl.lnk \ -nostartfiles \ @@ -522,6 +525,8 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) -Wl,--entry,_NtProcessStartup \ -Wl,--base-file,base.tmp \ $(TARGETNAME).o -lgcc \ + $(SDK_PATH_LIB)/string.a \ + $(SDK_PATH_LIB)/rosrtl.a \ $(DDK_PATH_LIB)/hal.a - $(RM) junk.tmp $(DLLTOOL) \ @@ -544,10 +549,12 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) -Wl,--entry,_NtProcessStartup \ -Wl,temp.exp \ $(TARGETNAME).o -lgcc \ + $(SDK_PATH_LIB)/string.a \ + $(SDK_PATH_LIB)/rosrtl.a \ $(DDK_PATH_LIB)/hal.a - $(RM) temp.exp -$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a +$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a - $(CC) \ -Wl,-T,$(LINKER_SCRIPT) \ -nostartfiles \ @@ -561,6 +568,8 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a -Wl,--entry,_NtProcessStartup \ -Wl,--base-file,base.tmp \ $(TARGETNAME).o -lgcc \ + $(SDK_PATH_LIB)/string.a \ + $(SDK_PATH_LIB)/rosrtl.a \ $(DDK_PATH_LIB)/hal.a - $(RM) junk.tmp $(DLLTOOL) \ @@ -583,13 +592,15 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a -Wl,--entry,_NtProcessStartup \ -Wl,temp.exp \ $(TARGETNAME).o -lgcc \ + $(SDK_PATH_LIB)/string.a \ + $(SDK_PATH_LIB)/rosrtl.a \ $(DDK_PATH_LIB)/hal.a - $(RM) temp.exp $(TARGETNAME).dbg.o: $(TARGETNAME).o $(STRIP) --strip-debug -o $(TARGETNAME).dbg.o $(TARGETNAME).o -$(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk +$(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a $(CC) \ -Wl,-T,$(TARGETNAME).dbg.lnk \ -nostartfiles \ @@ -603,6 +614,8 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk -Wl,--entry,_NtProcessStartup \ -Wl,--base-file,base.tmp \ $(TARGETNAME).dbg.o -lgcc \ + $(SDK_PATH_LIB)/string.a \ + $(SDK_PATH_LIB)/rosrtl.a \ $(DDK_PATH_LIB)/hal.a - $(RM) junk.tmp $(DLLTOOL) \ @@ -625,6 +638,8 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk -Wl,--entry,_NtProcessStartup \ -Wl,temp.exp \ $(TARGETNAME).dbg.o -lgcc \ + $(SDK_PATH_LIB)/string.a \ + $(SDK_PATH_LIB)/rosrtl.a \ $(DDK_PATH_LIB)/hal.a - $(RM) temp.exp @@ -660,8 +675,8 @@ implib: $(DDK_PATH_LIB)/$(TARGETNAME).a clean: - $(RM) $(OBJECTS_PATH)/*.o cc/*.o cm/*.o dbg/*.o dbg/i386/*.o ex/*.o \ - ex/i386/*.o io/*.o ke/*.o ldr/*.o mm/*.o nt/*.o ob/*.o ps/*.o \ - rtl/*.o rtl/i386/*.o se/*.o ke/i386/*.o mm/i386/*.o fs/*.o po/*.o nls/*.o \ + ex/i386/*.o inbv/*.o io/*.o ke/*.o ldr/*.o mm/*.o nt/*.o ob/*.o ps/*.o \ + rtl/*.o rtl/i386/*.o se/*.o ke/i386/*.o mm/i386/*.o fs/*.o po/*.o \ lpc/*.o kd/*.o $(TARGETNAME).o junk.tmp base.tmp temp.exp \ $(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym ntoskrnl.map \ $(TARGETNAME).coff bugcodes.rc msg?????.bin $(DEP_FILES) \