diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-04-23 15:48:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-25 10:04:53 +0200 |
| commit | 6b448d3634f26224e480c0f30c617eacd7b4e3ab (patch) | |
| tree | e829dd9ce5207e29be890c309e3b5ceaa3e4eea9 /solenv | |
| parent | da64d198ec3b31318c92ad4bcaab18cc2bf5cfdc (diff) | |
make __RSC a builtin define for the RSC compiler
instead of randomly defining it in only some of .src files
Change-Id: Ifec3920740723d248400f451d717b5288c421b8d
Reviewed-on: https://gerrit.libreoffice.org/36832
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 379b854ca4cd..d31b10b23b3a 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -86,6 +86,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(INCLUDE) \ -I$(dir $(3)) \ $(DEFS) \ + -D__RSC \ -fp=$(1) \ $(if $(MERGEDFILE),$(MERGEDFILE),$<)" > $${RESPONSEFILE} && \ $(gb_ResTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \ diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index b918f9605283..acc6ea2ba408 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -74,6 +74,7 @@ $(call gb_Helper_abbreviate_dirs,\ -MM -MP -MT $(call gb_SrsPartTarget_get_target,$(1)) \ $(INCLUDE) \ $(DEFS) \ + -D__RSC \ -c -x c++-header $(2) \ -o $(call gb_SrsPartTarget_get_dep_target,$(1))) endef diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 1f3caec82141..3a04f54a741f 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -461,6 +461,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(call gb_Executable_get_target,makedepend) \ $(INCLUDE) \ $(DEFS) \ + -D__RSC \ $(2) \ -o .src \ -p $(dir $(call gb_SrsPartTarget_get_target,$(1))) \ |