diff --git a/makefile b/makefile index b0b8760..91d7f1b 100644 --- a/makefile +++ b/makefile @@ -17,21 +17,6 @@ LDFLAGS= LDLIBS:= STRIP:=strip -#Windows workarounds -ifeq ($(OS),Windows_NT) - mkdir=mkdir $(subst /,\,$(1)) > NUL 2>&1 - rm=del /F $(1) > NUL 2>&1 - rmdir=rd /s /q $(1) > NUL 2>&1 - move=move /y $(subst /,\,$(1)) $(subst /,\,$(2)) > NUL 2>&1 - MAIN_EXECUTABLE:=$(MAIN_EXECUTABLE).exe - LDLIBS:= -else - mkdir=mkdir -p $(1) - rm=rm -f $(1) - rmdir=rm -rf $(1) - move=mv $(1) $(2) -endif - #Internal management of sources/objects and additional cflags INTERNAL_CFLAGS=-c $(foreach dir,$(INCLUDE_DIRS),-I"$(dir)") -MMD -MP -MF"$(DEPDIR)/$*.d" SOURCES:=$(foreach source,$(SOURCE_DIRS),$(foreach ext,$(EXT),$(wildcard $(source)/*.$(ext)))) @@ -70,15 +55,15 @@ $(foreach dir,$(SOURCE_DIRS),$(eval $(call GENERATE_OBJECTS,$(dir)))) $(OBJECTS): | $(OBJDIR) $(DEPDIR) $(OBJDIR): - $(call mkdir,"$@") + mkdir "$@" $(DEPDIR): - $(call mkdir,"$@") + mkdir "$@" .PHONY: clean clean: - $(call rmdir,"$(DEPDIR)") - $(call rmdir,"$(OBJDIR)") - $(call rm,"$(MAIN_EXECUTABLE)") + rm -rf "$(DEPDIR)" + rm -rf "$(OBJDIR)" + rm -f "$(MAIN_EXECUTABLE)" -include $(wildcard $(DEPDIR)/*.d)