From ec03d04682d85b6017232299651842171e030090 Mon Sep 17 00:00:00 2001 From: "Martin R. Smith" Date: Mon, 16 Nov 2020 14:10:13 +0000 Subject: [PATCH 1/7] Update README.md Windows instructions --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c336d7c..98ee29c 100644 --- a/README.md +++ b/README.md @@ -114,15 +114,12 @@ different location. This will compile pthreads and MPI versions Run 'modeltest-ng --help' for help about the console interface. -To compile a Windows executable, install MinGW and run: +To compile a Windows executable, install [MSYS2](https://www.msys2.org/) and run: ```bash +$ pacman -S autoconf automake make +$ autoreconf -i $ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes mingw64-configure $ make ``` -In case the configure script does not exist, it must be generated using autotools: - -```bash -$ autoreconf -i -``` From c4b2544d1d970766ee373fe5d291969fbba16dca Mon Sep 17 00:00:00 2001 From: "Martin R. Smith" Date: Mon, 16 Nov 2020 14:18:27 +0000 Subject: [PATCH 2/7] Update README.md Use MinGW --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 98ee29c..2758ecd 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,9 @@ different location. This will compile pthreads and MPI versions Run 'modeltest-ng --help' for help about the console interface. -To compile a Windows executable, install [MSYS2](https://www.msys2.org/) and run: +## Windows + +To compile a Windows executable, install [MSYS2](https://www.msys2.org/), then launch MinGW and run: ```bash $ pacman -S autoconf automake make From 08a07b52f911c19772476b3662a7cf15c5409bd2 Mon Sep 17 00:00:00 2001 From: "Martin R. Smith" Date: Mon, 16 Nov 2020 14:18:42 +0000 Subject: [PATCH 3/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2758ecd..b15afbe 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ different location. This will compile pthreads and MPI versions Run 'modeltest-ng --help' for help about the console interface. -## Windows +### Windows installation To compile a Windows executable, install [MSYS2](https://www.msys2.org/), then launch MinGW and run: From 7c38d782a7ea1ce1130e3f16c1a80d075c44d234 Mon Sep 17 00:00:00 2001 From: "Martin R. Smith" Date: Mon, 16 Nov 2020 14:23:29 +0000 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b15afbe..c829db2 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ Run 'modeltest-ng --help' for help about the console interface. To compile a Windows executable, install [MSYS2](https://www.msys2.org/), then launch MinGW and run: ```bash -$ pacman -S autoconf automake make +$ pacman -S autoconf automake make gcc $ autoreconf -i $ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes mingw64-configure $ make From fb4780020376805a800eaa8488ba192cbcbe4ead Mon Sep 17 00:00:00 2001 From: "Martin R. Smith" Date: Mon, 16 Nov 2020 14:36:02 +0000 Subject: [PATCH 5/7] +libtool, flex --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c829db2..8dc0348 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,11 @@ Run 'modeltest-ng --help' for help about the console interface. To compile a Windows executable, install [MSYS2](https://www.msys2.org/), then launch MinGW and run: ```bash -$ pacman -S autoconf automake make gcc +$ pacman -S autoconf automake make gcc libtool flex bison +$ cd libs/pll-modules +$ autoreconf -i +$ ./configure +$ cd ../ $ autoreconf -i $ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes mingw64-configure $ make From e1e1496db9e6b076aa6e6c30dcb20a15ff6d87a2 Mon Sep 17 00:00:00 2001 From: "Martin R. Smith" Date: Mon, 16 Nov 2020 14:48:36 +0000 Subject: [PATCH 6/7] cmake showing promise... --- README.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8dc0348..aab844b 100644 --- a/README.md +++ b/README.md @@ -119,13 +119,18 @@ Run 'modeltest-ng --help' for help about the console interface. To compile a Windows executable, install [MSYS2](https://www.msys2.org/), then launch MinGW and run: ```bash -$ pacman -S autoconf automake make gcc libtool flex bison -$ cd libs/pll-modules +$ pacman -S autoconf automake make cmake gcc libtool flex bison +$ cd libs/pll-modules/libs/libpll $ autoreconf -i $ ./configure -$ cd ../ -$ autoreconf -i -$ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes mingw64-configure $ make +$ cd ../../ +$ autoreconf -i +$ ./configure +$ mkdir build && cd build && cmake .. && make +$ cd ../../../ +$ autoreconf -i +$ mkdir build && cd build && cmake .. && make +$ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes ./configure ``` From b35450a485f26d5dc3fbee51cfbb6e294dd0f99c Mon Sep 17 00:00:00 2001 From: "Martin R. Smith" Date: Mon, 16 Nov 2020 15:19:29 +0000 Subject: [PATCH 7/7] Working Windows instructions --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index aab844b..5d516f7 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,5 @@ $ mkdir build && cd build && cmake .. && make $ cd ../../../ $ autoreconf -i $ mkdir build && cd build && cmake .. && make -$ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes ./configure ```