summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/bin/pchdelta.py1
-rw-r--r--solenv/inc/settings.mk1
-rw-r--r--solenv/inc/target.mk4
3 files changed, 2 insertions, 4 deletions
diff --git a/solenv/bin/pchdelta.py b/solenv/bin/pchdelta.py
index 52a0df4ecc5d..b7ab7f4044ed 100755
--- a/solenv/bin/pchdelta.py
+++ b/solenv/bin/pchdelta.py
@@ -14,7 +14,6 @@
#
# Examples:
#
-# pchdelta.py inc/pch/precompiled_sfx2.hxx inc source/dialog
#
# Run pchdelta inside sfx2 first building the pch files and then files in
# source/dialog
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