diff options
Diffstat (limited to 'cpp/config/Make.rules')
| -rw-r--r-- | cpp/config/Make.rules | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 878b330e3ce..67335ca86f6 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -255,12 +255,11 @@ endif SLICE2CPPFLAGS = $(ICECPPFLAGS) ifeq ($(ice_dir), /usr) - CPPFLAGS = LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) else ifeq ($(MinGW), yes) includedir_win = $(shell $(top_srcdir)/../cpp/config/cygpath-win.sh $(includedir)) - CPPFLAGS = -I"$(includedir_win)" + CPPFLAGS += -I"$(includedir_win)" ice_dir_win = $(shell $(top_srcdir)/../cpp/config/cygpath-win.sh $(ice_dir)) ifdef ice_src_dist LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) @@ -268,7 +267,7 @@ else LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L"$(ice_dir_win)\$(binsubdir)" endif else - CPPFLAGS = -I$(includedir) + CPPFLAGS += -I$(includedir) ifdef ice_src_dist LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) else |