Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Linked the string library to ntoskrnl.

Browse source 
svn path=/trunk/; revision=4771
This commit is contained in:
Hartmut Birr 2003-05-27 19:21:14 +00:00
parent e44c02e52b
commit ce562b2ba0
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/ntoskrnl/Makefile
View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.95 2003/05/21 15:06:33 ekohl Exp $ # $Id: Makefile,v 1.96 2003/05/27 19:21:14 hbirr Exp $
# #
# ReactOS Operating System # ReactOS Operating System
# #
@ -92,9 +92,7 @@ OBJECTS_RTL = \
rtl/math.o \ rtl/math.o \
rtl/mem.o \ rtl/mem.o \
rtl/memchr.o \ rtl/memchr.o \
rtl/memcpy.o \
rtl/memmove.o \ rtl/memmove.o \
rtl/memset.o \
rtl/message.o \ rtl/message.o \
rtl/nls.o \ rtl/nls.o \
rtl/purecall.o \ rtl/purecall.o \
@ -499,7 +497,7 @@ OBJECTS := \
$(OBJECTS_RESOURCE) $(OBJECTS_RESOURCE)
$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/string.a
$(CC) \ $(CC) \
-Wl,-T,ntoskrnl.lnk \ -Wl,-T,ntoskrnl.lnk \
-nostartfiles \ -nostartfiles \
@ -513,6 +511,7 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
-Wl,--entry,_NtProcessStartup \ -Wl,--entry,_NtProcessStartup \
-Wl,--base-file,base.tmp \ -Wl,--base-file,base.tmp \
$(TARGETNAME).o -lgcc \ $(TARGETNAME).o -lgcc \
$(SDK_PATH_LIB)/string.a \
$(DDK_PATH_LIB)/hal.a $(DDK_PATH_LIB)/hal.a
- $(RM) junk.tmp - $(RM) junk.tmp
$(DLLTOOL) \ $(DLLTOOL) \
@ -535,10 +534,11 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
-Wl,--entry,_NtProcessStartup \ -Wl,--entry,_NtProcessStartup \
-Wl,temp.exp \ -Wl,temp.exp \
$(TARGETNAME).o -lgcc \ $(TARGETNAME).o -lgcc \
$(SDK_PATH_LIB)/string.a \
$(DDK_PATH_LIB)/hal.a $(DDK_PATH_LIB)/hal.a
- $(RM) temp.exp - $(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
- $(CC) \ - $(CC) \
-Wl,-T,$(LINKER_SCRIPT) \ -Wl,-T,$(LINKER_SCRIPT) \
-nostartfiles \ -nostartfiles \
@ -552,6 +552,7 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a
-Wl,--entry,_NtProcessStartup \ -Wl,--entry,_NtProcessStartup \
-Wl,--base-file,base.tmp \ -Wl,--base-file,base.tmp \
$(TARGETNAME).o -lgcc \ $(TARGETNAME).o -lgcc \
$(SDK_PATH_LIB)/string.a \
$(DDK_PATH_LIB)/hal.a $(DDK_PATH_LIB)/hal.a
- $(RM) junk.tmp - $(RM) junk.tmp
$(DLLTOOL) \ $(DLLTOOL) \
@ -574,13 +575,14 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a
-Wl,--entry,_NtProcessStartup \ -Wl,--entry,_NtProcessStartup \
-Wl,temp.exp \ -Wl,temp.exp \
$(TARGETNAME).o -lgcc \ $(TARGETNAME).o -lgcc \
$(SDK_PATH_LIB)/string.a \
$(DDK_PATH_LIB)/hal.a $(DDK_PATH_LIB)/hal.a
- $(RM) temp.exp - $(RM) temp.exp
$(TARGETNAME).dbg.o: $(TARGETNAME).o $(TARGETNAME).dbg.o: $(TARGETNAME).o
$(STRIP) --strip-debug -o $(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
$(CC) \ $(CC) \
-Wl,-T,$(TARGETNAME).dbg.lnk \ -Wl,-T,$(TARGETNAME).dbg.lnk \
-nostartfiles \ -nostartfiles \
@ -594,6 +596,7 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk
-Wl,--entry,_NtProcessStartup \ -Wl,--entry,_NtProcessStartup \
-Wl,--base-file,base.tmp \ -Wl,--base-file,base.tmp \
$(TARGETNAME).dbg.o -lgcc \ $(TARGETNAME).dbg.o -lgcc \
$(SDK_PATH_LIB)/string.a \
$(DDK_PATH_LIB)/hal.a $(DDK_PATH_LIB)/hal.a
- $(RM) junk.tmp - $(RM) junk.tmp
$(DLLTOOL) \ $(DLLTOOL) \
@ -616,6 +619,7 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk
-Wl,--entry,_NtProcessStartup \ -Wl,--entry,_NtProcessStartup \
-Wl,temp.exp \ -Wl,temp.exp \
$(TARGETNAME).dbg.o -lgcc \ $(TARGETNAME).dbg.o -lgcc \
$(SDK_PATH_LIB)/string.a \
$(DDK_PATH_LIB)/hal.a $(DDK_PATH_LIB)/hal.a
- $(RM) temp.exp - $(RM) temp.exp

6
reactos/ntoskrnl/Makefile.i386
View file

@ -40,15 +40,11 @@ OBJECTS_MM_I386 := \
mm/i386/pfault.o mm/i386/pfault.o
OBJECTS_RTL_I386 := \ OBJECTS_RTL_I386 := \
rtl/i386/memset.o \
rtl/i386/memcpy.o \
rtl/i386/except.o \ rtl/i386/except.o \
rtl/i386/exception.o \ rtl/i386/exception.o \
rtl/i386/seh.o rtl/i386/seh.o
RTL_EXCLUDE_FILTER := \ RTL_EXCLUDE_FILTER :=
rtl/memset.o \
rtl/memcpy.o
OBJECTS_ARCH = $(OBJECTS_BOOT) $(OBJECTS_EX_I386) $(OBJECTS_KE_I386) $(OBJECTS_MM_I386) $(OBJECTS_RTL_I386) OBJECTS_ARCH = $(OBJECTS_BOOT) $(OBJECTS_EX_I386) $(OBJECTS_KE_I386) $(OBJECTS_MM_I386) $(OBJECTS_RTL_I386)