Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

this fixes the problem with NASM invocation in make

Browse source 
svn path=/trunk/; revision=46
This commit is contained in:
Rex Jolliff 1998-09-20 02:19:42 +00:00
parent 7967ac94a2
commit 9a55f0f7ed
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/rules.mak
View file

@ -47,7 +47,7 @@ CC = $(PREFIX)gcc
NATIVE_CC = gcc NATIVE_CC = gcc
CFLAGS = -O2 -I../../../include -I../../include -I../include -fno-builtin $(DEFINES) -Wall -Wstrict-prototypes CFLAGS = -O2 -I../../../include -I../../include -I../include -fno-builtin $(DEFINES) -Wall -Wstrict-prototypes
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
NASM = nasm ASM = nasm
NFLAGS = -i../include/ -f$(NASM_FORMAT) NFLAGS = -i../include/ -f$(NASM_FORMAT)
LD = $(PREFIX)ld LD = $(PREFIX)ld
NM = $(PREFIX)nm NM = $(PREFIX)nm
@ -59,7 +59,7 @@ CPP = $(PREFIX)cpp
%.o: %.cc %.o: %.cc
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
%.o: %.asm %.o: %.asm
$(NASM) $(NFLAGS) $< -o $@ $(ASM) $(NFLAGS) $< -o $@
RULES_MAK_INCLUDED = 1 RULES_MAK_INCLUDED = 1