Fixed obvious typos.

[reactos.git] / rosapps / rules.mak

diff --git a/rosapps/rules.mak b/rosapps/rules.mak
index afae57c..79c9e67 100644 (file)
--- a/rosapps/rules.mak
+++ b/rosapps/rules.mak
@@ -22,8 +22,12 @@ PREFIX = i586-mingw32-
 EXE_POSTFIX = 
 CP = cp
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
+FLOPPY_DIR = A/
+# DIST_DIR should be relative from the top of the tree
+DIST_DIR = dist
 endif
 
+
 ifeq ($(HOST),mingw32-windows)
 PREFIX = 
 EXE_POSTFIX = .exe
@@ -31,6 +35,9 @@ CP = copy
 DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as
 RM = del
 DOSCLI = yes
+FLOPPY_DIR = A:
+# DIST_DIR should be relative from the top of the tree
+DIST_DIR = dist
 endif
 
 #
@@ -56,9 +63,17 @@ endif
 
 CC = $(PREFIX)gcc
 NATIVE_CC = gcc
-CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-builtin \
-         $(LEAN_AND_MEAN_DEFINE) $(DEFINES) $(DEBUGGING_CFLAGS) \
-         $(EXTRA_CFLAGS)
+CFLAGS = \
+       $(BASE_CFLAGS) \
+       -pipe \
+       -O2 \
+       -Wall \
+       -Wstrict-prototypes \
+       -fno-builtin \
+       $(LEAN_AND_MEAN_DEFINE) \
+       $(DEFINES) \
+       $(DEBUGGING_CFLAGS) \
+       $(EXTRA_CFLAGS)
 CXXFLAGS = $(CFLAGS)
 LD = $(PREFIX)ld
 NM = $(PREFIX)nm
@@ -68,9 +83,19 @@ AS = $(PREFIX)gcc -c -x assembler-with-cpp
 CPP = $(PREFIX)cpp
 AR = $(PREFIX)ar
 RC = $(PREFIX)windres
+RCINC = --include-dir ../reactos/include --include-dir ../../reactos/include --include-dir ../../../reactos/include
 
+%.o: %.cpp
+       $(CC) $(CFLAGS) -c $< -o $@
+%.o: %.cc
+       $(CC) $(CFLAGS) -c $< -o $@
 %.o: %.c
        $(CC) $(CFLAGS) -c $< -o $@
+%.o: %.asm
+       $(NASM_CMD) $(NFLAGS) $< -o $@
+%.coff: %.rc
+       $(RC) $(RCINC) $< $@
+
 
 
 RULES_MAK_INCLUDED = 1