From 70b5be7ec3c94cf4719ea56d0276c381b8aa0004 Mon Sep 17 00:00:00 2001
From: Karel Matas <karel.matas@souko.cz>
Date: Sun, 7 Jul 2013 19:50:41 +0200
Subject: [PATCH] OPT added to MAkefile; KanjiView::Cell constructor: fg,bg
 changed to int (Fl_Color may be unsigned)

---
 Makefile              | 10 ++++++----
 help/en.html          |  0
 src/gui_kanjiview.hxx |  2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 help/en.html

diff --git a/Makefile b/Makefile
index f0bca03..a47987c 100755
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,10 @@
 
 CXX               = clang
 CC                = $(CXX)
-DEBUG             = -DDEBUG -O0 -g -ggdb3
+DEBUG             = -DDEBUG -g -ggdb3
 WARNINGS          = -Wall -Wno-vla -Wno-long-long -pedantic
 
+OPT               = -O2
 LIBS              = -L/usr/local/lib -L/lib
 INCLUDE           = -I/include
 CURL_CFLAGS       = $(shell curl-config --cflags)
@@ -94,6 +95,7 @@ HEAD=\
 
 build: ${NAME}
 
+debug: OPT=-00
 debug: CXXFLAGS += ${DEBUG}
 ifneq ($(shell uname),Linux) # show console in Windows
 debug: LDFLAGS += -mconsole
@@ -101,13 +103,13 @@ endif
 debug: build
 
 %.o: %.c
-	${CC} ${CFLAGS} -c $< -o $@
+	${CC} ${CFLAGS} ${OPT} -c $< -o $@
 
 %.o: %.cxx
-	${CXX} ${CXXFLAGS} -c $< -o $@
+	${CXX} ${CXXFLAGS}  ${OPT} -c $< -o $@
 
 ${NAME}: ${OBJ}
-	${CXX} ${CXXFLAGS} ${OBJ} -o ${NAME} ${LDFLAGS}
+	${CXX} ${CXXFLAGS}  ${OPT} ${OBJ} -o ${NAME} ${LDFLAGS}
 
 clean:
 	rm -f src/*.o src/3rdparty/*.o src/gui/*.o ${NAME} 2>/dev/null
diff --git a/help/en.html b/help/en.html
old mode 100644
new mode 100755
diff --git a/src/gui_kanjiview.hxx b/src/gui_kanjiview.hxx
index edbe58c..1622c6f 100755
--- a/src/gui_kanjiview.hxx
+++ b/src/gui_kanjiview.hxx
@@ -57,7 +57,7 @@ class KanjiView : public Fl_Table
         bool selected = false;
         Fl_Color fgcolor;
         Fl_Color bgcolor;
-        Cell ( const string &s, Fl_Color fg=-1, Fl_Color bg=-1 ) : str(s)
+        Cell ( const string &s, int fg=-1, int bg=-1 ) : str(s)
         {
           fgcolor = (fg!=-1) ?fg:FL_FOREGROUND_COLOR;
           bgcolor = (bg!=-1) ?bg:FL_BACKGROUND2_COLOR;
-- 
2.11.4.GIT