Fix for Makefile on Windows and gitignore now ignores the release folder

This commit is contained in:
BjossiAlfreds 2019-09-14 11:03:05 +00:00
parent 325910d2fe
commit 21a52d294a
2 changed files with 7 additions and 1 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
/build/
/release/

View file

@ -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