From 73c9584af277afbe35a2229e00e345949951e353 Mon Sep 17 00:00:00 2001 From: BjossiAlfreds Date: Sat, 14 Sep 2019 10:50:56 +0000 Subject: [PATCH] Makefile fix for 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 bb11865..4959198 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,11 @@ endif 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) @@ -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