diff options
| author | alejandro-colomar <colomar.6.4.3@gmail.com> | 2019-07-31 20:14:27 +0200 |
|---|---|---|
| committer | alejandro-colomar <colomar.6.4.3@gmail.com> | 2019-07-31 20:14:27 +0200 |
| commit | 18b229131822ab5af3a89dd11004f0b6b0e33c11 (patch) | |
| tree | 3952f2f0ea38eb6ece64a3ecd91de145bcddd5c6 | |
| parent | 4f1ae8626a01c49357e7f4339e71400757d177e5 (diff) | |
main.cpp -> main.c
| -rw-r--r-- | src/main.c (renamed from src/main.cpp) | 13 | ||||
| -rw-r--r-- | tmp/Makefile | 10 |
2 files changed, 9 insertions, 14 deletions
diff --git a/src/main.cpp b/src/main.c index 06175e9..9bacdbd 100644 --- a/src/main.cpp +++ b/src/main.c @@ -7,17 +7,12 @@ /****************************************************************************** ******* headers ************************************************************** ******************************************************************************/ -#include <cstdio> +#include <stdio.h> -#include "libalx/base/compiler/restrict.hpp" -#include "libalx/base/errno/error.hpp" +#include "libalx/base/errno/error.h" -/* Workaround <ncurses.h> naming collision */ -#undef LINES -#undef COLS - -#include "coins/coins.hpp" -#include "coins/parse.hpp" +#include "coins/coins.h" +#include "coins/parse.h" /****************************************************************************** diff --git a/tmp/Makefile b/tmp/Makefile index 6b4e1cf..7d16ff5 100644 --- a/tmp/Makefile +++ b/tmp/Makefile @@ -30,10 +30,10 @@ COINS_SRC = \ $(SRC_DIR)/coins.c MAIN_INC = \ - $(INC_DIR)/coins/coins.hpp \ - $(INC_DIR)/coins/parse.hpp + $(INC_DIR)/coins/coins.h \ + $(INC_DIR)/coins/parse.h MAIN_SRC = \ - $(SRC_DIR)/main.cpp + $(SRC_DIR)/main.c PARSE_INC = \ $(INC_DIR)/coins/parse.h \ @@ -58,8 +58,8 @@ coins.o: coins.s $(Q)$(AS) $< -o $@ main.s: $(MAIN_SRC) $(MAIN_INC) - @echo " CXX coins/tmp/$@" - $(Q)$(CXX) $(CXXFLAGS) -I $(INC_DIR) -S $< -o $@ + @echo " CC coins/tmp/$@" + $(Q)$(CC) $(CFLAGS) -I $(INC_DIR) -S $< -o $@ main.o: main.s @echo " AS coins/tmp/$@" $(Q)$(AS) $< -o $@ |