diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-27 15:24:45 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-27 15:24:45 -0600 |
| commit | 3f2ff54778ff76118b7de3357168091bbc955041 (patch) | |
| tree | 601e358120589466b0f54a02fd1940dfe4919cb8 /solenv/inc | |
| parent | b33971cb124de2bea5332d6adb802bd84eb57652 (diff) | |
remove pch from the include list
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/settings.mk | 1 | ||||
| -rw-r--r-- | solenv/inc/target.mk | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index a80ea3340077..abfcb41b406d 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -709,7 +709,6 @@ COMMONBIN=$(LOCAL_COMMON_OUT)/bin # Include-Pfad # still without -I here s.a. target.mk INCLUDE INC=$(PRJ)/inc -INCPCH=$(PRJ)/inc/pch INCLOCAL=../inc INCGUI=$(PRJ)/$(GUIBASE)/inc INCCOM=$(OUT)/inc diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index c9114beea07d..819609100e47 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -56,9 +56,9 @@ SOLARINC+=$(JDKINCS) INCLUDE:= .EXPORT : INCLUDE .IF "$(PRJINC)"!="" -INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) +INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) .ELSE # "$(PRJINC)"!="" -INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) +INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) .ENDIF # "$(PRJINC)"!="" INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) .EXPORT : LIB |