4 modified files
reactos
diff -u -r1.90 -r1.91
--- rules.mak 4 Jun 2004 23:44:26 -0000 1.90
+++ rules.mak 5 Jun 2004 09:47:35 -0000 1.91
@@ -28,7 +28,7 @@
EXE_POSTFIX :=
EXE_PREFIX := ./
DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
-NASM = nasm
+NASM_CMD = nasm
DOSCLI =
FLOPPY_DIR = /mnt/floppy
SEP := /
@@ -41,7 +41,7 @@
EXE_PREFIX :=
EXE_POSTFIX := .exe
DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
-NASM = nasmw
+NASM_CMD = nasmw
DOSCLI = yes
FLOPPY_DIR = A:
SEP := \$(EMPTY_VAR)
reactos/tools
diff -u -r1.66 -r1.67
--- helper.mk 3 Jun 2004 03:09:01 -0000 1.66
+++ helper.mk 5 Jun 2004 09:47:35 -0000 1.67
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.66 2004/06/03 03:09:01 hyperion Exp $
+# $Id: helper.mk,v 1.67 2004/06/05 09:47:35 hbirr Exp $
#
# Helper makefile for ReactOS modules
# Variables this makefile accepts:
@@ -1059,7 +1059,7 @@
%.o: %.s
$(AS) $(TARGET_ASFLAGS) -c $< -o $@
%.o: %.asm
- $(NASM) $(TARGET_NFLAGS) $< -o $@
+ $(NASM_CMD) $(TARGET_NFLAGS) $< -o $@
%.coff: %.rc
$(RC) $(TARGET_RCFLAGS) $< -o $@
%.spec.def: %.spec
reactos/tools
diff -u -r1.16 -r1.17
--- depend.mk 2 Jun 2004 18:24:09 -0000 1.16
+++ depend.mk 5 Jun 2004 09:47:36 -0000 1.17
@@ -35,4 +35,4 @@
$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
.%.d: %.asm $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)
- $(NASM) $(NFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
+ $(NASM_CMD) $(NFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
reactos/loaders/dos
diff -u -r1.10 -r1.11
--- makefile 2 Jun 2004 18:24:08 -0000 1.10
+++ makefile 5 Jun 2004 09:47:36 -0000 1.11
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.10 2004/06/02 18:24:08 hyperion Exp $
+# $Id: makefile,v 1.11 2004/06/05 09:47:36 hbirr Exp $
PATH_TO_TOP = ../..
@@ -7,7 +7,7 @@
all: loadros.com
loadros.com: loadros.asm
- $(NASM) -fbin -o loadros.com loadros.asm
+ $(NASM_CMD) -fbin -o loadros.com loadros.asm
clean:
- $(RM) loadros.com
CVSspam 0.2.8