diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..567609b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/build/globals.d b/build/globals.d deleted file mode 100644 index 49d7c7a..0000000 --- a/build/globals.d +++ /dev/null @@ -1,2 +0,0 @@ -build/globals.o: src/globals.c src/../include/globals.h -src/../include/globals.h: diff --git a/build/globals.o b/build/globals.o deleted file mode 100644 index 4a0c38a..0000000 Binary files a/build/globals.o and /dev/null differ diff --git a/build/logic.d b/build/logic.d deleted file mode 100644 index ff34596..0000000 --- a/build/logic.d +++ /dev/null @@ -1,4 +0,0 @@ -build/logic.o: src/logic.c src/../include/logic.h \ - src/../include/globals.h -src/../include/logic.h: -src/../include/globals.h: diff --git a/build/logic.o b/build/logic.o deleted file mode 100644 index 93bc5bd..0000000 Binary files a/build/logic.o and /dev/null differ diff --git a/build/main.d b/build/main.d deleted file mode 100644 index 767f5ec..0000000 --- a/build/main.d +++ /dev/null @@ -1,3 +0,0 @@ -build/main.o: src/main.c include/windows.h include/logic.h -include/windows.h: -include/logic.h: diff --git a/build/main.o b/build/main.o deleted file mode 100644 index e6b6b9a..0000000 Binary files a/build/main.o and /dev/null differ diff --git a/build/testLogic.d b/build/testLogic.d deleted file mode 100644 index 5a0fa52..0000000 --- a/build/testLogic.d +++ /dev/null @@ -1,4 +0,0 @@ -build/testLogic.o: src/testLogic.c src/../include/logic.h \ - src/../include/globals.h -src/../include/logic.h: -src/../include/globals.h: diff --git a/build/testLogic.o b/build/testLogic.o deleted file mode 100644 index f6118ee..0000000 Binary files a/build/testLogic.o and /dev/null differ diff --git a/build/windows.d b/build/windows.d deleted file mode 100644 index f019f6a..0000000 --- a/build/windows.d +++ /dev/null @@ -1,5 +0,0 @@ -build/windows.o: src/windows.c src/../include/windows.h \ - src/../include/logic.h src/../include/globals.h -src/../include/windows.h: -src/../include/logic.h: -src/../include/globals.h: diff --git a/build/windows.o b/build/windows.o deleted file mode 100644 index 5558db7..0000000 Binary files a/build/windows.o and /dev/null differ diff --git a/makefile b/makefile index d67b264..f738d37 100644 --- a/makefile +++ b/makefile @@ -3,13 +3,18 @@ CFLAGS = -I./include -Wall -Wextra -MMD -MP LDLIBS = -lncurses SRC_DIR = src BUILD_DIR = build -SOURCES = $(wildcard $(SRC_DIR)/*.c) + +SOURCES = $(filter-out $(SRC_DIR)/testLogic.c, $(wildcard $(SRC_DIR)/*.c)) OBJECTS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(SOURCES)) +TEST_SOURCES = $(SRC_DIR)/logic.c $(SRC_DIR)/testLogic.c +TEST_OBJECTS = $(patsubst $(SRC_DIR)/%.c,$(BUILD_DIR)/%.o,$(TEST_SOURCES)) + EXEC = productManager EXECTEST = test DEPS = $(OBJECTS:.o=.d) + all: $(EXEC) $(EXEC): $(OBJECTS) @@ -21,8 +26,9 @@ $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c -include $(DEPS) -test: - $(CC) $(CFLAGS) src/logic.c src/testLogic.c -o $(EXECTEST) + +test: $(TEST_OBJECTS) + $(CC) $^ -o $(EXECTEST) $(LDLIBS) clean: rm -rf $(BUILD_DIR) $(EXEC) diff --git a/src/windows.c b/src/windows.c index e413f60..550bc05 100644 --- a/src/windows.c +++ b/src/windows.c @@ -122,7 +122,7 @@ void runOptionsMenu(){ curs_set(0); wattroff(optionsWin, COLOR_PAIR(2)); - if (exists(input)) { + if (existsFile(input)) { statusf("Il file '%s' esiste e verra' utilizzato al posto di '%s'", input, productPricesFileLocation); strcpy(productPricesFileLocation, input); }