yquake2/rogue
0
0
Fork 0
mirror of https://github.com/yquake2/rogue.git synced 2024-11-22 20:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #23 from BjossiAlfreds/makefile-gitignore-fix

Browse source 
Fix for Makefile on Windows and gitignore now ignores the release folder
This commit is contained in:
Yamagi 2019-09-15 09:16:13 +02:00 committed by GitHub
commit f8ac90d2a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

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

7
Makefile
View file

@ -29,6 +29,11 @@ ifneq (,$(findstring MINGW,$(OSTYPE)))
OSTYPE := Windows OSTYPE := Windows
endif endif
# On Windows / MinGW $(CC) is undefined by default.
ifeq ($(OSTYPE),Windows)
CC := gcc
endif
# Detect the architecture # Detect the architecture
ifeq ($(OSTYPE), Windows) ifeq ($(OSTYPE), Windows)
ifdef PROCESSOR_ARCHITEW6432 ifdef PROCESSOR_ARCHITEW6432
@ -78,7 +83,7 @@ ifeq ($(OSTYPE), Darwin)
CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
-Wall -pipe -g -fwrapv -arch i386 -arch x86_64 -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
else else
CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing -fomit-frame-pointer \
-Wall -pipe -g -MMD -fwrapv -Wall -pipe -g -MMD -fwrapv
endif endif