From d7989ce3bf2b591a143a0fed69002a0a9e852ff6 Mon Sep 17 00:00:00 2001 From: Kirill Smelkov Date: Wed, 5 Sep 2007 16:37:30 +0400 Subject: [PATCH] Add suppurt for INCLUDES and CPPFLAGS --- Winemake.include | 6 +++--- clock+wow32/Makefile | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Winemake.include b/Winemake.include index f9d9f0d..0301d07 100644 --- a/Winemake.include +++ b/Winemake.include @@ -217,14 +217,14 @@ quiet_cmd_mkdir = MKDIR $! cc_dep_opts = -MD -MF $(@:%.o=$(DEPDIR)/%.d) quiet_cmd_c_c = CC $! - cmd_c_c = $(CC) -c $(CFLAGS) $(CEXTRA) $(DEFINCL) -o $@ $< $(cc_dep_opts) + cmd_c_c = $(CC) -c $(CFLAGS) $(CEXTRA) $(CPPFLAGS) $(INCLUDES:%=-I%) -o $@ $< $(cc_dep_opts) quiet_cmd_cxx_c = C++ $! - cmd_cxx_c = $(CXX) -c $(CXXFLAGS) $(CXXEXTRA) $(DEFINCL) -o $@ $< $(cc_dep_opts) + cmd_cxx_c = $(CXX) -c $(CXXFLAGS) $(CXXEXTRA) $(CPPFLAGS) $(INCLUDES:%=-I%) -o $@ $< $(cc_dep_opts) # TODO add dependency generation for RC command quiet_cmd_rc_x = RC $! - cmd_rc_x = $(RC) $(RCFLAGS) $(RCEXTRA) $(DEFINCL) -fo$@ $< + cmd_rc_x = $(RC) $(RCFLAGS) $(RCEXTRA) $(INCLUDES:%=-I%) -fo$@ $< $(DEPDIR): diff --git a/clock+wow32/Makefile b/clock+wow32/Makefile index c3b91b0..d450b16 100644 --- a/clock+wow32/Makefile +++ b/clock+wow32/Makefile @@ -11,6 +11,9 @@ SUBDIRS := winhttp # export CXXEXTRA := -mno-cygwin # export LDEXTRA := -mno-cygwin +# list of directories to place into include search path +INCLUDES:= + ############# # clock.exe # ############# -- 2.11.4.GIT