git://git.jankratochvil.net
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update for HEAD-2003050101
[reactos.git]
/
rules.mak
diff --git
a/rules.mak
b/rules.mak
index
23ab1d6
..
6996ac7
100644
(file)
--- a/
rules.mak
+++ b/
rules.mak
@@
-18,8
+18,12
@@
endif
ifeq ($(HOST),mingw32-linux)
TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
ifeq ($(HOST),mingw32-linux)
TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
+else
+TOPDIR := $(shell cd)
endif
endif
+TOPDIR := $(TOPDIR)/$(PATH_TO_TOP)
+
#
# Choose various options
#
#
# Choose various options
#
@@
-60,6
+64,8
@@
INSTALL_DIR = $(PATH_TO_TOP)/reactos
DIST_DIR = $(PATH_TO_TOP)/dist
# endif
DIST_DIR = $(PATH_TO_TOP)/dist
# endif
+# Directory to build a bootable CD image in
+BOOTCD_DIR=$(TOPDIR)/../bootcd/disk
CC = $(PREFIX)gcc
CXX = $(PREFIX)g++
CC = $(PREFIX)gcc
CXX = $(PREFIX)g++
@@
-79,6
+85,7
@@
OBJCOPY = $(PREFIX)objcopy
TOOLS_PATH = $(PATH_TO_TOP)/tools
CP = $(TOOLS_PATH)/rcopy
RM = $(TOOLS_PATH)/rdel
TOOLS_PATH = $(PATH_TO_TOP)/tools
CP = $(TOOLS_PATH)/rcopy
RM = $(TOOLS_PATH)/rdel
+RLINE = $(TOOLS_PATH)/rline
RMDIR = $(TOOLS_PATH)/rrmdir
RMKDIR = $(TOOLS_PATH)/rmkdir
RSYM = $(TOOLS_PATH)/rsym
RMDIR = $(TOOLS_PATH)/rrmdir
RMKDIR = $(TOOLS_PATH)/rmkdir
RSYM = $(TOOLS_PATH)/rsym
@@
-89,11
+96,11
@@
MC = $(TOOLS_PATH)/wmc/wmc
# Maybe we can delete these soon
ifeq ($(HOST),mingw32-linux)
# Maybe we can delete these soon
ifeq ($(HOST),mingw32-linux)
-CFLAGS := $(CFLAGS) -I$(PATH_TO_TOP)/include -pipe -march=i386
+CFLAGS := $(CFLAGS) -I$(PATH_TO_TOP)/include -pipe -march=i386
-D_M_IX86
endif
ifeq ($(HOST),mingw32-windows)
endif
ifeq ($(HOST),mingw32-windows)
-CFLAGS := $(CFLAGS) -I$(PATH_TO_TOP)/include -pipe -march=i386
+CFLAGS := $(CFLAGS) -I$(PATH_TO_TOP)/include -pipe -march=i386
-D_M_IX86
endif
CXXFLAGS = $(CFLAGS)
endif
CXXFLAGS = $(CFLAGS)