diff --git a/Makefile b/Makefile index 696bc1c..7ae0cc7 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ CFLAGS ?= -Wextra -Wall -O2 .PHONY: all install uninstall clean -nms: $(OBJ)/input.o $(OBJ)/error.o $(OBJ)/nmscharset.o $(OBJ)/nmstermio.o $(OBJ)/nmseffect.o $(OBJ)/nms.o | $(BIN) +nms: $(OBJ)/input.o $(OBJ)/error.o $(OBJ)/nmstermio.o $(OBJ)/nmseffect.o $(OBJ)/nms.o | $(BIN) $(CC) $(CFLAGS) -o $(BIN)/$@ $^ target/release/libnmsrust.a sneakers: $(OBJ)/nmscharset.o $(OBJ)/nmstermio.o $(OBJ)/nmseffect.o $(OBJ)/sneakers.o | $(BIN) @@ -27,7 +27,7 @@ all: nms sneakers all-ncurses: nms-ncurses sneakers-ncurses -nms-ncurses: $(OBJ)/input.o $(OBJ)/error.o $(OBJ)/nmscharset.o $(OBJ)/nmstermio_ncurses.o $(OBJ)/nmseffect.o $(OBJ)/nms.o | $(BIN) +nms-ncurses: $(OBJ)/input.o $(OBJ)/error.o $(OBJ)/nmstermio_ncurses.o $(OBJ)/nmseffect.o $(OBJ)/nms.o | $(BIN) $(CC) $(CFLAGS) -o $(BIN)/nms $^ -lncursesw sneakers-ncurses: $(OBJ)/nmscharset.o $(OBJ)/nmstermio_ncurses.o $(OBJ)/nmseffect.o $(OBJ)/sneakers.o | $(BIN) diff --git a/src/nms.c b/src/nms.c index 320889f..0eb44e6 100644 --- a/src/nms.c +++ b/src/nms.c @@ -4,43 +4,12 @@ * This program is free software; you can redistribute it and/or modify it * under the terms of the GPL License. See LICENSE for more details. */ - -#include #include -#include -#include -#include "nmseffect.h" -#include "input.h" -#include "error.h" - -#define VERSION "1.0.1" extern void rust_main(); -int main(int argc, char *argv[]) +int main(void) { rust_main(); - /* - unsigned char *input = NULL; - - int r = input_get(&input, "Enter input: "); - if (r < 0) - { - error_log("Could not get input."); - error_print(); - return EXIT_FAILURE; - } - else if (r == 0) - { - error_log("Input is empty."); - error_print(); - return EXIT_FAILURE; - } - - r = nmseffect_exec(input, r); - - free(input); - */ - return EXIT_SUCCESS; }