From: Michael Göhler <somebody.here@gmx.de>
Date: Sat, 27 Sep 2014 10:24:02 +0000 (+0200)
Subject: Merge pull request #38 from FreeBirdLjj/issue#16
X-Git-Url: https://git.danieliu.xyz/?p=smdp.git;a=commitdiff_plain;h=618df4fd72bc78c3012a0987ab9e7183a404b20c;hp=bc3a373a2926e34352018677bfb5ed2eacede2a8

Merge pull request #38 from FreeBirdLjj/issue#16

Issue#16
---

diff --git a/Makefile b/Makefile
index f922b7e..5801f84 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,9 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-OSTYPE  := $(shell uname -o)
 CURSES   = ncursesw
 ifeq (Windows_NT, $(OS))
+OSTYPE  := $(shell uname -o)
 ifneq (Cygwin, $(OSTYPE))
 CURSES  := pdcurses
 endif
diff --git a/README.md b/README.md
index 9bb7d8a..cbf3326 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,8 @@
 
 mdp needs the ncursesw headers to compile.
 So make sure you have them installed:
-- On Ubuntu/Debian you need `libncursesw5` and `libncursesw5-dev` to be installed.
+- on Ubuntu/Debian you need `libncursesw5` and `libncursesw5-dev`
+- on Cygwin you need `libncursesw10` and `libncurses-devel`
 
 Now download and install mdp:
 
diff --git a/include/main.h b/include/main.h
index 05d05f4..0e65cd3 100644
--- a/include/main.h
+++ b/include/main.h
@@ -25,6 +25,6 @@
 
 #define MDP_VER_MAJOR 0
 #define MDP_VER_MINOR 91
-#define MDP_VER_REVISION 1
+#define MDP_VER_REVISION 2
 
 #endif // !defined( MAIN_H )
diff --git a/src/Makefile b/src/Makefile
index f0783e9..42d5563 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,8 +26,8 @@ ifeq ($(DEBUG),1)
 CFLAGS  := -O0 -Wall -g -I../include
 endif
 
-OSTYPE  := $(shell uname -o)
 ifeq (Windows_NT, $(OS))
+OSTYPE  := $(shell uname -o)
 ifneq (Cygwin, $(OSTYPE))
 CFLAGS  += -DWIN32=1
 endif
diff --git a/src/viewer.c b/src/viewer.c
index 6b551de..e3d2651 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -114,7 +114,7 @@ int ncurses_display(deck_t *deck, int notrans, int nofade, int invert) {
         if(max_lines + bar_top + bar_bottom + 2 > LINES)
             fprintf(stderr, "You may need to add additional horizontal rules ('***') to split your file in shorter slides.\n");
         if(max_cols > COLS)
-            fprintf(stderr, "Automatic line wrapping is not supported jet. You may need to shorten some lines by inserting line breaks.\n");
+            fprintf(stderr, "Automatic line wrapping is not supported yet. You may need to shorten some lines by inserting line breaks.\n");
 
         return(1);
     }