[Libreoffice-commits] .: solenv/gbuild

[Jan Holesovsky]

 solenv/gbuild/platform/WNT_INTEL_GCC.mk |    7 ++----
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    6 +----
 solenv/gbuild/platform/windows.mk       |   34 ++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 8 deletions(-)

New commits:
commit ee08eee8c09b6c7fb30b482b8e1168177995ffe3
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Nov 11 19:20:25 2011 +0100

    Introduce generic windows.mk for gbuild.
    
    This fixes the MinGW installation problems with officehelper.py.

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index f2d5507..9edf458 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -26,15 +26,14 @@
 #
 #*************************************************************************
 
-GUI := WNT
+# please make generic modifications to either of these
+include $(GBUILDDIR)/platform/com_GCC_defs.mk
+include $(GBUILDDIR)/platform/windows.mk
 
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CPUDEFS := -D_M_IX86
 
-include $(GBUILDDIR)/platform/com_GCC_defs.mk
-
 gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
-gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
 
 gb_RC := $(WINDRES)
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 43e7698..05a0b34 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -26,11 +26,11 @@
 #
 #*************************************************************************
 
-GUI := WNT
+# 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))
-gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
 
 gb_CC := cl
 gb_CXX := cl
@@ -274,8 +274,6 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
 $(1)))))
 endef
 
-gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
-
 # YaccTarget class
 
 define gb_YaccTarget__command
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
new file mode 100644
index 0000000..35658b2
--- /dev/null
+++ b/solenv/gbuild/platform/windows.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+#  Copyright (C) 2011 Jan Holesovsky <kendy at suse.cz>, SUSE (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+GUI := WNT
+
+gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
+
+gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
+
+# vim:set noexpandtab: