Start working on support for compiling on windows using msys2.

FossilOrigin-Name: d0b8a592f04b7c438aff01694ef262cef67b71da7625bf7415c1e61ff22d8a63

5 files changed, 16 insertions, 18 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5afdad4..b0d8f1d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,12 +4,12 @@ EXTRA_DIST += tests/scripts/simfail.sh
 
 check_PROGRAMS += testbin-aplwc_errstr
 testbin_aplwc_errstr_SOURCES = tests/aplwc_errstr.c
-testbin_aplwc_errstr_LDADD = libaplwc.la
+testbin_aplwc_errstr_LDADD = libaplwc.la libosmain.la
 TESTS += testbin-aplwc_errstr
 
 check_PROGRAMS += testbin-aplwc_utf8
 testbin_aplwc_utf8_SOURCES= tests/aplwc_utf8.c
-testbin_aplwc_utf8_LDADD = libaplwc.la
+testbin_aplwc_utf8_LDADD = libaplwc.la libosmain.la
 TESTS += testbin-aplwc_utf8
 
 TEST_EXTENSIONS += .txt
@@ -18,7 +18,7 @@ EXTRA_DIST += $(TXT_LOG_COMPILER)
 
 check_PROGRAMS += testbin-aplwc_eval
 testbin_aplwc_eval_SOURCES= tests/aplwc_eval.c
-testbin_aplwc_eval_LDADD = libaplwc.la
+testbin_aplwc_eval_LDADD = libaplwc.la libosmain.la
 TEST_INPUTS += \
 	tests/aplwc_eval/good/1.txt \
 	tests/aplwc_eval/good/2.txt \
@@ -26,7 +26,7 @@ TEST_INPUTS += \
 
 check_PROGRAMS += testbin-aplwc_read
 testbin_aplwc_read_SOURCES= tests/aplwc_read.c
-testbin_aplwc_read_LDADD = libaplwc.la
+testbin_aplwc_read_LDADD = libaplwc.la libosmain.la
 TEST_INPUTS += \
 	tests/aplwc_read/good/1.txt \
 	tests/aplwc_read/good/2.txt \
diff --git a/tests/aplwc_errstr.c b/tests/aplwc_errstr.c
index d1e6a20..3ee41b4 100644
--- a/tests/aplwc_errstr.c
+++ b/tests/aplwc_errstr.c
@@ -17,8 +17,8 @@
  * along with aplwc.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <os.h>
+#include <os_main.h>
 #include <aplwc.h>
 
 static void *
@@ -36,7 +36,7 @@ my_dealloc(void *p)
 }
 
 int
-main(void)
+portable_main(int argc, char *argv[])
 {
 	enum aplwc_rc ret;
 	struct aplwc_fns fns;
diff --git a/tests/aplwc_eval.c b/tests/aplwc_eval.c
index deb1610..bb90104 100644
--- a/tests/aplwc_eval.c
+++ b/tests/aplwc_eval.c
@@ -17,9 +17,8 @@
  * along with aplwc.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <os.h>
+#include <os_main.h>
 #include <aplwc.h>
 
 static void *
@@ -37,7 +36,7 @@ my_dealloc(void *p)
 }
 
 int
-main(int argc, char *argv[])
+portable_main(int argc, char *argv[])
 {
 	char *input;
 	struct aplwc *aplwc;
diff --git a/tests/aplwc_read.c b/tests/aplwc_read.c
index 902c9d2..9f299a5 100644
--- a/tests/aplwc_read.c
+++ b/tests/aplwc_read.c
@@ -17,9 +17,8 @@
  * along with aplwc.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <os.h>
+#include <os_main.h>
 #include <aplwc.h>
 
 static void *
@@ -37,7 +36,7 @@ my_dealloc(void *p)
 }
 
 int
-main(int argc, char *argv[])
+portable_main(int argc, char *argv[])
 {
 	struct aplwc_fns fns;
 	char *input;
diff --git a/tests/aplwc_utf8.c b/tests/aplwc_utf8.c
index 7d14778..95c08a1 100644
--- a/tests/aplwc_utf8.c
+++ b/tests/aplwc_utf8.c
@@ -17,8 +17,8 @@
  * along with aplwc.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include <os.h>
+#include <os_main.h>
 #include <aplwc.h>
 
 uint8_t bad1[] = {0xff,0};
@@ -51,7 +51,7 @@ my_dealloc(void *p)
 }
 
 int
-main(void)
+portable_main(int argc, char *argv[])
 {
 	struct aplwc *aplwc;
 	AplwcLine line;