solenv/gbuild/platform/WNT_INTEL_GCC.mk | 5 ++--- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-)
New commits: commit 4847eb96151d07f63ae91519f03c85932b0b51c0 Author: Jan Holesovsky <ke...@suse.cz> Date: Fri Nov 11 20:16:41 2011 +0100 Fix the TMPDIR setting, sorry. diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index d062037..b0b2bdb 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -26,15 +26,14 @@ # #************************************************************************* -# please make generic modifications to either of these gb_COMPILERDEFAULTOPTFLAGS := -Os gb_CPUDEFS := -D_M_IX86 +gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp) +# please make generic modifications to either of these include $(GBUILDDIR)/platform/com_GCC_defs.mk include $(GBUILDDIR)/platform/windows.mk -gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp) - gb_RC := $(WINDRES) gb_OSDEFS := \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 05a0b34..16694b3 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -26,12 +26,12 @@ # #************************************************************************* -# please make generic modifications to windows.mk -include $(GBUILDDIR)/platform/windows.mk - # set tmpdir to some mixed case path, suitable for native tools gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m /tmp)) +# please make generic Windows modifications to windows.mk +include $(GBUILDDIR)/platform/windows.mk + gb_CC := cl gb_CXX := cl gb_LINK := link _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits