mirror of
https://github.com/reactos/reactos.git
synced 2025-08-04 02:26:03 +00:00
small cleanup
svn path=/trunk/; revision=9974
This commit is contained in:
parent
8af3ba8548
commit
14377c13f5
1 changed files with 29 additions and 58 deletions
|
@ -1,4 +1,4 @@
|
||||||
# $Id: Makefile,v 1.128 2004/06/23 22:32:45 ion Exp $
|
# $Id: Makefile,v 1.129 2004/07/02 21:02:54 royce Exp $
|
||||||
#
|
#
|
||||||
# ReactOS Operating System
|
# ReactOS Operating System
|
||||||
#
|
#
|
||||||
|
@ -535,25 +535,31 @@ OBJECTS := \
|
||||||
$(OBJECTS_PATH)/inbv.o \
|
$(OBJECTS_PATH)/inbv.o \
|
||||||
$(OBJECTS_RESOURCE)
|
$(OBJECTS_RESOURCE)
|
||||||
|
|
||||||
|
NTOSKRNL_LIBS := \
|
||||||
|
$(DDK_PATH_LIB)/hal.a \
|
||||||
|
$(SDK_PATH_LIB)/rtl.a \
|
||||||
|
$(SDK_PATH_LIB)/string.a \
|
||||||
|
$(SDK_PATH_LIB)/rosrtl.a \
|
||||||
|
$(SDK_PATH_LIB)/pseh.a
|
||||||
|
|
||||||
$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/rtl.a $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a
|
NTOSKRNL_LD_FLAGS := \
|
||||||
|
-Wl,--subsystem,native \
|
||||||
|
-Wl,--image-base,0xc0000000 \
|
||||||
|
-Wl,--file-alignment,0x1000 \
|
||||||
|
-Wl,--section-alignment,0x1000 \
|
||||||
|
-Wl,--entry,_NtProcessStartup
|
||||||
|
|
||||||
|
$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(NTOSKRNL_LIBS)
|
||||||
$(CC) \
|
$(CC) \
|
||||||
-Wl,-T,ntoskrnl.lnk \
|
-Wl,-T,ntoskrnl.lnk \
|
||||||
-nostartfiles \
|
-nostartfiles \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-mdll \
|
-mdll \
|
||||||
-o junk.tmp \
|
-o junk.tmp \
|
||||||
-Wl,--subsystem,native \
|
$(NTOSKRNL_LD_FLAGS) \
|
||||||
-Wl,--image-base,0xc0000000 \
|
|
||||||
-Wl,--file-alignment,0x1000 \
|
|
||||||
-Wl,--section-alignment,0x1000 \
|
|
||||||
-Wl,--entry,_NtProcessStartup \
|
|
||||||
-Wl,--base-file,base.tmp \
|
-Wl,--base-file,base.tmp \
|
||||||
$(TARGETNAME).o -lgcc \
|
$(TARGETNAME).o -lgcc \
|
||||||
$(SDK_PATH_LIB)/rtl.a \
|
$(NTOSKRNL_LIBS)
|
||||||
$(SDK_PATH_LIB)/string.a \
|
|
||||||
$(SDK_PATH_LIB)/rosrtl.a \
|
|
||||||
$(DDK_PATH_LIB)/hal.a
|
|
||||||
- $(RM) junk.tmp
|
- $(RM) junk.tmp
|
||||||
$(DLLTOOL) \
|
$(DLLTOOL) \
|
||||||
--dllname $(TARGETNAME).exe \
|
--dllname $(TARGETNAME).exe \
|
||||||
|
@ -568,37 +574,23 @@ $(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA) $(SDK_PATH_LIB)/rtl.a $(SD
|
||||||
-Wl,-T,ntoskrnl.lnk \
|
-Wl,-T,ntoskrnl.lnk \
|
||||||
-mdll \
|
-mdll \
|
||||||
-o $(TARGETNAME).nostrip.exe \
|
-o $(TARGETNAME).nostrip.exe \
|
||||||
-Wl,--subsystem,native \
|
$(NTOSKRNL_LD_FLAGS) \
|
||||||
-Wl,--image-base,0xc0000000 \
|
|
||||||
-Wl,--file-alignment,0x1000 \
|
|
||||||
-Wl,--section-alignment,0x1000 \
|
|
||||||
-Wl,--entry,_NtProcessStartup \
|
|
||||||
-Wl,temp.exp \
|
-Wl,temp.exp \
|
||||||
$(TARGETNAME).o -lgcc \
|
$(TARGETNAME).o -lgcc \
|
||||||
$(SDK_PATH_LIB)/rtl.a \
|
$(NTOSKRNL_LIBS)
|
||||||
$(SDK_PATH_LIB)/string.a \
|
|
||||||
$(SDK_PATH_LIB)/rosrtl.a \
|
|
||||||
$(DDK_PATH_LIB)/hal.a
|
|
||||||
- $(RM) temp.exp
|
- $(RM) temp.exp
|
||||||
|
|
||||||
$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/rtl.a $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a
|
$(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(NTOSKRNL_LIBS)
|
||||||
- $(CC) \
|
- $(CC) \
|
||||||
-Wl,-T,$(LINKER_SCRIPT) \
|
-Wl,-T,$(LINKER_SCRIPT) \
|
||||||
-nostartfiles \
|
-nostartfiles \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-mdll \
|
-mdll \
|
||||||
-o junk.tmp \
|
-o junk.tmp \
|
||||||
-Wl,--subsystem,native \
|
$(NTOSKRNL_LD_FLAGS) \
|
||||||
-Wl,--image-base,0xc0000000 \
|
|
||||||
-Wl,--file-alignment,0x1000 \
|
|
||||||
-Wl,--section-alignment,0x1000 \
|
|
||||||
-Wl,--entry,_NtProcessStartup \
|
|
||||||
-Wl,--base-file,base.tmp \
|
-Wl,--base-file,base.tmp \
|
||||||
$(TARGETNAME).o -lgcc \
|
$(TARGETNAME).o -lgcc \
|
||||||
$(SDK_PATH_LIB)/rtl.a \
|
$(NTOSKRNL_LIBS)
|
||||||
$(SDK_PATH_LIB)/string.a \
|
|
||||||
$(SDK_PATH_LIB)/rosrtl.a \
|
|
||||||
$(DDK_PATH_LIB)/hal.a
|
|
||||||
- $(RM) junk.tmp
|
- $(RM) junk.tmp
|
||||||
$(DLLTOOL) \
|
$(DLLTOOL) \
|
||||||
--dllname $(TARGETNAME).exe \
|
--dllname $(TARGETNAME).exe \
|
||||||
|
@ -613,40 +605,26 @@ $(TARGETNAME).exe: $(TARGETNAME).o $(LINKER_SCRIPT) $(DDK_PATH_LIB)/hal.a $(SDK_
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-mdll \
|
-mdll \
|
||||||
-o $(TARGETNAME).exe \
|
-o $(TARGETNAME).exe \
|
||||||
-Wl,--subsystem,native \
|
$(NTOSKRNL_LD_FLAGS) \
|
||||||
-Wl,--image-base,0xc0000000 \
|
|
||||||
-Wl,--file-alignment,0x1000 \
|
|
||||||
-Wl,--section-alignment,0x1000 \
|
|
||||||
-Wl,--entry,_NtProcessStartup \
|
|
||||||
-Wl,temp.exp \
|
-Wl,temp.exp \
|
||||||
$(TARGETNAME).o -lgcc \
|
$(TARGETNAME).o -lgcc \
|
||||||
$(SDK_PATH_LIB)/rtl.a \
|
$(NTOSKRNL_LIBS)
|
||||||
$(SDK_PATH_LIB)/string.a \
|
|
||||||
$(SDK_PATH_LIB)/rosrtl.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 $(DDK_PATH_LIB)/hal.a $(SDK_PATH_LIB)/rtl.a $(SDK_PATH_LIB)/string.a $(SDK_PATH_LIB)/rosrtl.a
|
$(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(NTOSKRNL_LIBS)
|
||||||
$(CC) \
|
$(CC) \
|
||||||
-Wl,-T,$(TARGETNAME).dbg.lnk \
|
-Wl,-T,$(TARGETNAME).dbg.lnk \
|
||||||
-nostartfiles \
|
-nostartfiles \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-mdll \
|
-mdll \
|
||||||
-o junk.tmp \
|
-o junk.tmp \
|
||||||
-Wl,--subsystem,native \
|
$(NTOSKRNL_LD_FLAGS) \
|
||||||
-Wl,--image-base,0xc0000000 \
|
|
||||||
-Wl,--file-alignment,0x1000 \
|
|
||||||
-Wl,--section-alignment,0x1000 \
|
|
||||||
-Wl,--entry,_NtProcessStartup \
|
|
||||||
-Wl,--base-file,base.tmp \
|
-Wl,--base-file,base.tmp \
|
||||||
$(TARGETNAME).dbg.o -lgcc \
|
$(TARGETNAME).dbg.o -lgcc \
|
||||||
$(SDK_PATH_LIB)/rtl.a \
|
$(NTOSKRNL_LIBS)
|
||||||
$(SDK_PATH_LIB)/string.a \
|
|
||||||
$(SDK_PATH_LIB)/rosrtl.a \
|
|
||||||
$(DDK_PATH_LIB)/hal.a
|
|
||||||
- $(RM) junk.tmp
|
- $(RM) junk.tmp
|
||||||
$(DLLTOOL) \
|
$(DLLTOOL) \
|
||||||
--dllname $(TARGETNAME).dbg \
|
--dllname $(TARGETNAME).dbg \
|
||||||
|
@ -661,17 +639,10 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk $(D
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-mdll \
|
-mdll \
|
||||||
-o $(TARGETNAME).dbg \
|
-o $(TARGETNAME).dbg \
|
||||||
-Wl,--subsystem,native \
|
$(NTOSKRNL_LD_FLAGS) \
|
||||||
-Wl,--image-base,0xc0000000 \
|
|
||||||
-Wl,--file-alignment,0x1000 \
|
|
||||||
-Wl,--section-alignment,0x1000 \
|
|
||||||
-Wl,--entry,_NtProcessStartup \
|
|
||||||
-Wl,temp.exp \
|
-Wl,temp.exp \
|
||||||
$(TARGETNAME).dbg.o -lgcc \
|
$(TARGETNAME).dbg.o -lgcc \
|
||||||
$(SDK_PATH_LIB)/rtl.a \
|
$(NTOSKRNL_LIBS)
|
||||||
$(SDK_PATH_LIB)/string.a \
|
|
||||||
$(SDK_PATH_LIB)/rosrtl.a \
|
|
||||||
$(DDK_PATH_LIB)/hal.a
|
|
||||||
- $(RM) temp.exp
|
- $(RM) temp.exp
|
||||||
|
|
||||||
$(TARGETNAME).sym: $(TARGETNAME).nostrip.exe
|
$(TARGETNAME).sym: $(TARGETNAME).nostrip.exe
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue