Merge pull request #131 from rashil2000/build-fixes

Reset TERM variable on Windows

Author: abishekvashok

.gitignore

@@ -25,6 +25,7 @@ cscope.in.out
 cscope.po.out
 cscope.files
 cmatrix
+cmatrix.exe
 *.o
 *.core
 CMakeCache.txt

README.md

@@ -12,13 +12,13 @@ effect, you must specify `-s` on the command line. For usage info, use `cmatrix
 [![Build Status](https://travis-ci.org/abishekvashok/cmatrix.svg?branch=master)](https://travis-ci.org/abishekvashok/cmatrix)
 
 ### Dependencies
-You'll probably need a decent ncurses library (or PDCurses on native Windows) to get this to work.
+You'll probably need a decent ncurses library to get this to work. On Windows, using mingw-w64-ncurses is recommended (PDCurses will also work, but it does not support colors or bold text).
 
 ### Building and installing cmatrix
 To install cmatrix, use either of the following methods from within the cmatrix directory.
 
-#### Using `configure` (recommended for most linux user)
-```
+#### Using `configure` (recommended for most linux/mingw users)
+```shell
 autoreconf -i  # skip if using released tarball
 ./configure
 make
@@ -27,8 +27,8 @@ make install
 
 #### Using CMake
 Here we also show an out-of-source build in the sub directory "build".
-Don't use CMake if you want to use PDCurses, it won't work (for now).
-```
+(Doesn't work on Windows, for now).
+```shell
 mkdir -p build
 cd build
 # to install to "/usr/local"

cmatrix.c

@@ -48,8 +48,12 @@
 #ifdef HAVE_NCURSES_H
 #include <ncurses.h>
 #else
+#ifdef _WIN32
+#include <ncurses/curses.h>
+#else
 #include <curses.h>
 #endif
+#endif
 
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
@@ -421,6 +425,11 @@ int main(int argc, char *argv[]) {
         }
     }
 
+    /* Clear TERM variable on Windows */
+#ifdef _WIN32
+    _putenv_s("TERM", "");
+#endif
+
     if (force && strcmp("linux", getenv("TERM"))) {
 #ifdef _WIN32
         SetEnvironmentVariableW(L"TERM", L"linux");

configure.ac

@@ -78,6 +78,11 @@ if test "$ac_cv_prog_CC" = gcc -o "$ac_cv_prog_CC" = g++; then
   CFLAGS="$CFLAGS -Wall -Wno-comment"
 fi
 
+dnl Build static executable on native Windows
+if test x$native_windows != xno; then
+  CFLAGS="$CFLAGS -static"
+fi
+
 dnl cmatrix terminal font disable option (default enabled)
 AC_ARG_WITH([fonts],
 	AS_HELP_STRING([--without-fonts], [Install cmatrix without cmatrix font]),