summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOxore <oxore@protonmail.com>2017-11-30 17:42:15 +0300
committerOxore <oxore@protonmail.com>2017-11-30 17:42:15 +0300
commitae01c7fc02f17105f9e04af493f4dd8986fbcb8b (patch)
treeea40b11235633946b12b66aba56a412c5db800e4
parent75d123b79dc894f2c2de43f25009b5fa84a00eec (diff)
Move includes to root dir
-rw-r--r--Makefile3
-rw-r--r--_vimrc_local.vim4
-rw-r--r--include/common.h (renamed from src/include/common.h)0
-rw-r--r--include/functions.h (renamed from src/include/functions.h)0
-rw-r--r--include/tet_conf.h (renamed from src/include/tet_conf.h)0
-rw-r--r--src/functions.c4
-rw-r--r--src/main.c4
-rw-r--r--src/shape_maps.c2
8 files changed, 11 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 247a436..3d62d6e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,8 @@ FILES:=$(FILES:.c=.o)
CFLAGS += -Wall
CFLAGS += -std=c99
-CFLAGS += -O2
+CFLAGS += -O0
+CFLAGS += -Iinclude
LIBS += -lcsfml-graphics
LIBS += -lcsfml-window
LIBS += -lcsfml-system
diff --git a/_vimrc_local.vim b/_vimrc_local.vim
index c5055bf..78f02f7 100644
--- a/_vimrc_local.vim
+++ b/_vimrc_local.vim
@@ -3,3 +3,7 @@ if (&ft=='c' || &ft=='h' || &ft=='cpp')
setlocal tabstop=4
setlocal expandtab
endif
+
+" Neomake c include
+let g:neomake_c_enabled_makers = ['gcc']
+let g:neomake_c_gcc_maker = {'args': ['-fsyntax-only', '-Wall', '-Wextra', '-I../include/', '-I./include/']}
diff --git a/src/include/common.h b/include/common.h
index 5a3d63e..5a3d63e 100644
--- a/src/include/common.h
+++ b/include/common.h
diff --git a/src/include/functions.h b/include/functions.h
index ef9d42f..ef9d42f 100644
--- a/src/include/functions.h
+++ b/include/functions.h
diff --git a/src/include/tet_conf.h b/include/tet_conf.h
index 4896a56..4896a56 100644
--- a/src/include/tet_conf.h
+++ b/include/tet_conf.h
diff --git a/src/functions.c b/src/functions.c
index 503d971..e376f6b 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -1,5 +1,5 @@
-#include "include/common.h"
-#include "include/functions.h"
+#include "common.h"
+#include "functions.h"
/* Externs from main.c */
diff --git a/src/main.c b/src/main.c
index 9e226cf..8251b46 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
-#include "include/common.h"
-#include "include/functions.h"
+#include "common.h"
+#include "functions.h"
/* --- Variables --- */
int gameIsStarted = 0;
diff --git a/src/shape_maps.c b/src/shape_maps.c
index 0ee8d49..9de04d2 100644
--- a/src/shape_maps.c
+++ b/src/shape_maps.c
@@ -1,4 +1,4 @@
-#include "include/common.h"
+#include "common.h"
/*
* Shapes maps
*