Miroirs/wipeout-rewrite
1
0
Fork 0
mirror of https://github.com/phoboslab/wipeout-rewrite synced 2024-12-26 09:59:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #82 from johnflan/master

Browse source 
Fix issue with Makefile on MacOS with unsupported uname -o flag
This commit is contained in:
Dominic Szablewski 2023-09-17 11:33:00 +02:00 committed by GitHub
commit f9f7b15263
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,7 +1,6 @@
CC ?= gcc CC ?= gcc
EMCC ?= emcc EMCC ?= emcc
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
UNAME_O := $(shell uname -o)
RENDERER ?= GL RENDERER ?= GL
USE_GLX ?= false USE_GLX ?= false
DEBUG ?= false DEBUG ?= false
@ -38,8 +37,9 @@ endif
# macOS ------------------------------------------------------------------------ # macOS ------------------------------------------------------------------------
ifeq ($(UNAME_S), Darwin) ifeq ($(UNAME_S), Darwin)
BREW_HOME := $(shell brew --prefix)
C_FLAGS := $(C_FLAGS) -x objective-c -I/opt/homebrew/include -D_THREAD_SAFE -w C_FLAGS := $(C_FLAGS) -x objective-c -I/opt/homebrew/include -D_THREAD_SAFE -w
L_FLAGS := $(L_FLAGS) -L/opt/homebrew/lib -framework Foundation L_FLAGS := $(L_FLAGS) -L$(BREW_HOME)/lib -framework Foundation
ifeq ($(RENDERER), GL) ifeq ($(RENDERER), GL)
L_FLAGS := $(L_FLAGS) -lGLEW -GLU -framework OpenGL L_FLAGS := $(L_FLAGS) -lGLEW -GLU -framework OpenGL
@ -68,7 +68,7 @@ else ifeq ($(UNAME_S), Linux)
# Windows MSYS ------------------------------------------------------------------ # Windows MSYS ------------------------------------------------------------------
else ifeq ($(UNAME_O), Msys) else ifeq ($(shell uname -o), Msys)
ifeq ($(RENDERER), GL) ifeq ($(RENDERER), GL)
L_FLAGS := $(L_FLAGS) -lglew32 -lopengl32 L_FLAGS := $(L_FLAGS) -lglew32 -lopengl32
endif endif