Cosmetic: +Prevent: ... might be used uninitialized in this function

[reactos.git] / rules.mak

diff --git a/rules.mak b/rules.mak
index 355c468..6996ac7 100644 (file)
--- a/rules.mak
+++ b/rules.mak
@@ -8,13 +8,22 @@ ifeq ($(HOST),)
 HOST = mingw32-windows
 endif
 
+# Default to no PCH support
+ifeq ($(ROS_USE_PCH),)
+ROS_USE_PCH = no
+endif
+
 # uncomment if you use bochs and it displays only 30 rows
 # BOCHS_30ROWS = yes
 
 ifeq ($(HOST),mingw32-linux)
 TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
+else
+TOPDIR := $(shell cd)
 endif
 
+TOPDIR := $(TOPDIR)/$(PATH_TO_TOP)
+
 #
 # Choose various options
 #
@@ -55,6 +64,8 @@ INSTALL_DIR = $(PATH_TO_TOP)/reactos
 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++
@@ -74,20 +85,22 @@ OBJCOPY = $(PREFIX)objcopy
 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
+RTOUCH = $(TOOLS_PATH)/rtouch
 MC = $(TOOLS_PATH)/wmc/wmc
 
 
 # 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)
-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)
@@ -114,3 +127,24 @@ XDK_PATH_INC=$(XDK_PATH)/include
 WINE_PATH=$(PATH_TO_TOP)/../wine
 WINE_PATH_LIB=$(WINE_PATH)/lib
 WINE_PATH_INC=$(WINE_PATH)/include
+
+# Posix+ Integration
+POSIX_PATH=$(PATH_TO_TOP)/../posix
+POSIX_PATH_LIB=$(POSIX_PATH)/lib
+POSIX_PATH_INC=$(POSIX_PATH)/include
+
+# OS/2 Integration
+OS2_PATH=$(PATH_TO_TOP)/../os2
+OS2_PATH_LIB=$(OS2_PATH)/lib
+OS2_PATH_INC=$(OS2_PATH)/include
+
+# Other systems integration
+ROOT_PATH=$(PATH_TO_TOP)/..
+
+COMCTL32_TARGET = comctl23
+
+SHELL32_TARGET = shell23
+
+COMDLG32_TARGET = comdlg23
+
+