Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed the build system to treat nasm as a first-class citizen, making it produce output in the correct format (Microsoft COFF) and cleaning up some bit rot (unused makefile variables, different conventions from the rest of the build system, etc.)

Browse source 
svn path=/trunk/; revision=9588
This commit is contained in:
KJK::Hyperion 2004-06-02 18:24:09 +00:00
parent 5053990958
commit 3a1705b0b1
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/loaders/dos/makefile
View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.9 2003/11/24 16:44:10 ekohl Exp $
# $Id: makefile,v 1.10 2004/06/02 18:24:08 hyperion Exp $
PATH_TO_TOP = ../..
@ -7,7 +7,7 @@ include $(PATH_TO_TOP)/rules.mak
all: loadros.com
loadros.com: loadros.asm
$(NASM_CMD) -fbin -o loadros.com loadros.asm
$(NASM) -fbin -o loadros.com loadros.asm
clean:
- $(RM) loadros.com

4
reactos/ntoskrnl/Makefile
View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.121 2004/05/31 23:37:22 gdalsnes Exp $
# $Id: Makefile,v 1.122 2004/06/02 18:24:09 hyperion Exp $
#
# ReactOS Operating System
#
@ -744,7 +744,7 @@ ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h
%.o: %.s
$(AS) $(ASFLAGS) -c $< -o $@
%.o: %.asm
$(NASM_CMD) $(NFLAGS) $< -o $@
$(NASM) $(NFLAGS) $< -o $@
%.coff: %.rc
$(RC) $(RCFLAGS) $< -o $@

5
reactos/rules.mak
View file

@ -28,7 +28,7 @@ PREFIX = mingw32-
EXE_POSTFIX :=
EXE_PREFIX := ./
DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
NASM_CMD = nasm
NASM = nasm
DOSCLI =
FLOPPY_DIR = /mnt/floppy
SEP := /
@ -41,7 +41,7 @@ PREFIX =
EXE_PREFIX :=
EXE_POSTFIX := .exe
DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
NASM_CMD = nasmw
NASM = nasmw
DOSCLI = yes
FLOPPY_DIR = A:
SEP := \$(EMPTY_VAR)
@ -103,6 +103,7 @@ STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=i386
STD_CPPFLAGS = $(STD_CFLAGS)
STD_ASFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -D__ASM__ -D_M_IX86
STD_RCFLAGS = --include-dir $(PATH_TO_TOP)/include --include-dir $(W32API_PATH)/include
STD_NFLAGS = -f win32
# Developer Kits
DK_PATH=$(PATH_TO_TOP)/dk

2
reactos/tools/depend.mk
View file

@ -35,4 +35,4 @@ endif
$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
.%.d: %.asm $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)
$(NASM_CMD) $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
$(NASM) $(NFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@

7
reactos/tools/helper.mk
View file

@ -1,4 +1,4 @@
# $Id: helper.mk,v 1.64 2004/05/29 21:24:48 hbirr Exp $
# $Id: helper.mk,v 1.65 2004/06/02 18:24:09 hyperion Exp $
#
# Helper makefile for ReactOS modules
# Variables this makefile accepts:
@ -619,7 +619,7 @@ TARGET_RCFLAGS += $(MK_RCFLAGS) $(STD_RCFLAGS)
TARGET_ASFLAGS += $(MK_ASFLAGS) $(STD_ASFLAGS)
TARGET_NFLAGS += $(MK_NFLAGS)
TARGET_NFLAGS += $(MK_NFLAGS) $(STD_NFLAGS)
MK_GCCLIBS := $(addprefix -l, $(TARGET_GCCLIBS))
@ -1057,7 +1057,7 @@ endif # ROS_USE_PCH
%.o: %.s
$(AS) $(TARGET_ASFLAGS) -c $< -o $@
%.o: %.asm
$(NASM_CMD) $(NFLAGS) $(TARGET_NFLAGS) $< -o $@
$(NASM) $(TARGET_NFLAGS) $< -o $@
%.coff: %.rc
$(RC) $(TARGET_RCFLAGS) $< -o $@
%.spec.def: %.spec
@ -1071,5 +1071,6 @@ endif # ROS_USE_PCH
# Compatibility
CFLAGS := $(TARGET_CFLAGS)
NFLAGS := $(TARGET_NFLAGS)
# EOF