mirror of
https://github.com/reactos/reactos.git
synced 2025-05-29 05:58:13 +00:00
Use user flags when building host tools
svn path=/trunk/; revision=29177
This commit is contained in:
parent
5dc2b7e865
commit
ea8a8e47da
7 changed files with 11 additions and 11 deletions
2
reactos/lib/3rdparty/zlib/zlib.mak
vendored
2
reactos/lib/3rdparty/zlib/zlib.mak
vendored
|
@ -33,7 +33,7 @@ ZLIB_HOST_OBJECTS = \
|
|||
$(addprefix $(INTERMEDIATE_), $(ZLIB_HOST_SOURCES:.c=.host.o))
|
||||
|
||||
ZLIB_HOST_CFLAGS = -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
|
||||
-Wstrict-prototypes -Wmissing-prototypes
|
||||
-Wstrict-prototypes -Wmissing-prototypes $(TOOLS_CPPFLAGS)
|
||||
|
||||
$(ZLIB_HOST_TARGET): $(ZLIB_HOST_OBJECTS) | $(ZLIB_OUT)
|
||||
$(ECHO_AR)
|
||||
|
|
|
@ -32,7 +32,7 @@ CMLIB_HOST_OBJECTS = \
|
|||
|
||||
CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \
|
||||
-I$(CMLIB_BASE) -Iinclude/reactos -Iinclude \
|
||||
-DCMLIB_HOST
|
||||
-DCMLIB_HOST $(HOST_CFLAGS)
|
||||
|
||||
$(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT)
|
||||
$(ECHO_AR)
|
||||
|
|
|
@ -32,7 +32,7 @@ INFLIB_HOST_OBJECTS = \
|
|||
|
||||
INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \
|
||||
-Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \
|
||||
-Iinclude/reactos -Iinclude
|
||||
-Iinclude/reactos -Iinclude $(HOST_CFLAGS)
|
||||
|
||||
$(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT)
|
||||
$(ECHO_AR)
|
||||
|
|
|
@ -29,7 +29,7 @@ CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \
|
|||
CABMAN_OBJECTS = \
|
||||
$(addprefix $(INTERMEDIATE_), $(CABMAN_SOURCES:.cxx=.o))
|
||||
|
||||
CABMAN_HOST_CXXFLAGS = -Iinclude/reactos -Ilib/3rdparty/zlib $(TOOLS_CXXFLAGS)
|
||||
CABMAN_HOST_CXXFLAGS = -Iinclude/reactos -Ilib/3rdparty/zlib $(TOOLS_CPPFLAGS)
|
||||
|
||||
CABMAN_HOST_LIBS = $(ZLIB_HOST_TARGET)
|
||||
|
||||
|
|
|
@ -30,10 +30,10 @@ MKHIVE_SOURCES = $(addprefix $(MKHIVE_BASE_), \
|
|||
MKHIVE_OBJECTS = \
|
||||
$(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o))
|
||||
|
||||
MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \
|
||||
-DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3
|
||||
MKHIVE_HOST_CFLAGS = -fshort-wchar -I$(INFLIB_BASE) -I$(CMLIB_BASE) \
|
||||
-DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3 $(HOST_CFLAGS)
|
||||
|
||||
MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3
|
||||
MKHIVE_HOST_LFLAGS = $(TOOLS_LFLAGS) -g3
|
||||
|
||||
.PHONY: mkhive
|
||||
mkhive: $(MKHIVE_TARGET)
|
||||
|
|
|
@ -5,8 +5,8 @@ TOOLS_INT_ = $(TOOLS_INT)$(SEP)
|
|||
TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE)
|
||||
TOOLS_OUT_ = $(TOOLS_OUT)$(SEP)
|
||||
|
||||
TOOLS_CFLAGS = $(HOST_CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing
|
||||
TOOLS_CPPFLAGS = $(HOST_CPPFLAGS) -Wall -Wpointer-arith
|
||||
TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing $(HOST_CFLAGS)
|
||||
TOOLS_CPPFLAGS = -Wall -Wpointer-arith $(HOST_CPPFLAGS)
|
||||
TOOLS_LFLAGS = $(HOST_LFLAGS)
|
||||
|
||||
# HACK: Remove those lines once host tools don't use target headers anymore
|
||||
|
|
|
@ -56,11 +56,11 @@ WIDL_SOURCES = $(addprefix $(WIDL_BASE_), \
|
|||
WIDL_OBJECTS = \
|
||||
$(addprefix $(INTERMEDIATE_), $(WIDL_SOURCES:.c=.o))
|
||||
|
||||
WIDL_HOST_CFLAGS = $(TOOLS_CFLAGS) \
|
||||
WIDL_HOST_CFLAGS = \
|
||||
-DINT16=SHORT -D__USE_W32API -DYYDEBUG=1 -D__REACTOS__=1 \
|
||||
-I$(WIDL_BASE) -I$(WPP_BASE) \
|
||||
-Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \
|
||||
-I$(INTERMEDIATE_)include
|
||||
-I$(INTERMEDIATE_)include $(TOOLS_CFLAGS)
|
||||
|
||||
WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS)
|
||||
|
||||
|
|
Loading…
Reference in a new issue