[Libreoffice-commits] core.git: 2 commits - configure.ac
Tor Lillqvist
tml at collabora.com
Thu Dec 18 04:52:25 PST 2014
configure.ac | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 564fe23374fa544c34875da0dd695cb8a939f0f2
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 18 14:44:18 2014 +0200
Improve documentation how to build the Win32 make
Change-Id: If47512f4a5893e21318f062301a0fd6fcf121cfc
diff --git a/configure.ac b/configure.ac
index f9bd9d0..021c7de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12839,10 +12839,11 @@ place yourself in a working directory of you choice.
[go to Start menu, click "All Programs", click "Visual Studio 2013", click "Visual Studio Tools", double-click "VS2013 x86 Native Tools Command Prompt" or "VS2013 x64 Native Tools Comand Prompt"]
set PATH=%PATH%;C:\Cygwin\bin
[or Cygwin64, if that is what you have]
- cd .../path/to/make_git
+ cd path-to-make-repor-you-cloned-above
build_w32.bat --without-guile
-should result in a WinRel/gnumake.exe
+should result in a WinRel/gnumake.exe.
+Copy it to to the Cygwin /opt/lo/bin directory as make.exe
Then re-run autogen.sh
commit ff926b84508e500fd8b1deda0a7304f0026f6c8c
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 18 14:38:45 2014 +0200
Adapt instructions to VS2013 and 64-bit Cygwin
Change-Id: Ie6b7ccd3e3a6d459cb44e4d545ceaf4eb26c06bb
diff --git a/configure.ac b/configure.ac
index c7cd156..f9bd9d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12836,8 +12836,9 @@ place yourself in a working directory of you choice.
git clone git://git.savannah.gnu.org/make.git
- [go to Start menu, click on "VS2012 x86 Native Tools Command Prompt"]
+ [go to Start menu, click "All Programs", click "Visual Studio 2013", click "Visual Studio Tools", double-click "VS2013 x86 Native Tools Command Prompt" or "VS2013 x64 Native Tools Comand Prompt"]
set PATH=%PATH%;C:\Cygwin\bin
+ [or Cygwin64, if that is what you have]
cd .../path/to/make_git
build_w32.bat --without-guile
More information about the Libreoffice-commits
mailing list