summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-01-23 18:44:16 +0100
committerRichard Braun <rbraun@sceen.net>2017-01-23 18:44:16 +0100
commitd6d8afda9e32501063cee907b20507d4762a3bc0 (patch)
treeb7ce0e4ebb80318279f3e59d6ea8252d81743d55 /Makefile
parent0335271456550084988c5484bd1109a0a846669b (diff)
Minor updateHEADmaster
- Fix errors with modern compilers (gcc, clang) - Upgrade gtkmm dependency - Add a test.mtx file - Build with 64-bits words by default
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1235a0d..62b78a3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
# $Id$
CC = g++
-CPPFLAGS = -Wall $$(pkg-config gtkmm-2.0 --cflags) # -D USE_64BITS_WORDS
+CPPFLAGS += -D USE_64BITS_WORDS
+CFLAGS = -O3 -g
+CFLAGS += -Wall $$(pkg-config gtkmm-2.4 --cflags)
LIBS =
HEADERS = mtx.h mtxinteger.h mtxrational.h mtxmatrix.h mtxexception.h \
mtxdivbyzeroexception.h mtxsingularmatrixexception.h \
@@ -16,7 +18,7 @@ CLI_LIBS = -lreadline $(LIBS)
CLI_OBJECTS = main_cli.o $(OBJECTS)
CLI_BINARY = mtx_cli
-GUI_LIBS = $$(pkg-config gtkmm-2.0 --libs) $(LIBS)
+GUI_LIBS = $$(pkg-config gtkmm-2.4 --libs) $(LIBS)
GUI_OBJECTS = main_gui.o mtxwindow.o mtxhistory.o mtxentry.o $(OBJECTS)
GUI_BINARY = mtx_gui
@@ -38,7 +40,7 @@ $(GUI_BINARY): $(GUI_OBJECTS)
$(CC) -o $(GUI_BINARY) $(GUI_OBJECTS) $(GUI_LIBS)
%.o: %.cc $(HEADERS)
- $(CC) $(CPPFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) -c $<
doc: doc/html/index.html