From 21a52d294ac00526559f3810e1539a1e51b616fe Mon Sep 17 00:00:00 2001 From: BjossiAlfreds Date: Sat, 14 Sep 2019 11:03:05 +0000 Subject: [PATCH] Fix for Makefile on Windows and gitignore now ignores the release folder --- .gitignore | 1 + Makefile | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 84c048a..cadaacd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /build/ +/release/ \ No newline at end of file diff --git a/Makefile b/Makefile index b6d96b4..b29a925 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,11 @@ ifneq (,$(findstring MINGW,$(OSTYPE))) OSTYPE := Windows endif +# On Windows / MinGW $(CC) is undefined by default. +ifeq ($(OSTYPE),Windows) +CC := gcc +endif + # Detect the architecture ifeq ($(OSTYPE), Windows) ifdef PROCESSOR_ARCHITEW6432 @@ -78,7 +83,7 @@ ifeq ($(OSTYPE), Darwin) CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ -Wall -pipe -g -fwrapv -arch i386 -arch x86_64 else -CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ +CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing -fomit-frame-pointer \ -Wall -pipe -g -MMD -fwrapv endif