From 58f1fa340aaf2d53ce120f8c01acff38dd1c5d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 27 Aug 2007 07:21:26 +0000 Subject: [PATCH] Rename CFLAGS to HOST_FLAGS, CPPFLAGS to HOST_CPPFLAGS, LFLAGS to HOST_LFLAGS svn path=/trunk/; revision=28594 --- reactos/Makefile | 8 ++++---- reactos/tools/tools.mak | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/reactos/Makefile b/reactos/Makefile index fd43631c668..acbba93ed48 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -161,15 +161,15 @@ ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) export OSTYPE = msys HOST=mingw32-linux -CFLAGS+=-fshort-wchar -CPPFLAGS+=-fshort-wchar +HOST_CFLAGS+=-fshort-wchar +HOST_CPPFLAGS+=-fshort-wchar else HOST=mingw32-windows endif else HOST=mingw32-linux -CFLAGS+=-fshort-wchar -CPPFLAGS+=-fshort-wchar +HOST_CFLAGS+=-fshort-wchar +HOST_CPPFLAGS+=-fshort-wchar endif endif diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak index 87bfde7715b..ad5a6dfc73d 100644 --- a/reactos/tools/tools.mak +++ b/reactos/tools/tools.mak @@ -5,9 +5,9 @@ TOOLS_INT_ = $(TOOLS_INT)$(SEP) TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) -TOOLS_CFLAGS = $(CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing -TOOLS_CPPFLAGS = $(CPPFLAGS) -Wall -Wpointer-arith -TOOLS_LFLAGS = $(LFLAGS) +TOOLS_CFLAGS = $(HOST_CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing +TOOLS_CPPFLAGS = $(HOST_CPPFLAGS) -Wall -Wpointer-arith +TOOLS_LFLAGS = $(HOST_LFLAGS) $(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR)