MetzNet
/
roleplay
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed homebrew paths from makefile

main
noah metz 2024-10-16 15:28:42 -06:00
parent 934a0a30f3
commit edf8718cca
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/Makefile
Unescape Escape View File

@ -11,31 +11,28 @@ SPV_FILES = $(VERT_SPV) $(FRAG_SPV) $(COMP_SPV)
EXTRA_DEBUG_REQUIREMENTS := EXTRA_DEBUG_REQUIREMENTS :=
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
OS :=
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
CC = clang GDB = gdb
CPP = clang++
GDB = GDB
endif endif
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
LDFLAGS += -L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/llvm/lib/c++ -L/opt/homebrew/lib DSYM = dsymutil
CC = /opt/homebrew/opt/llvm/bin/clang GDB = lldb
CPP = /opt/homebrew/opt/llvm/bin/clang++
DSYM = /opt/homebrew/opt/llvm/bin/dsymutil
GDB = /opt/homebrew/opt/llvm/bin/lldb
EXTRA_DEBUG_REQUIREMENTS = roleplay.dSYM EXTRA_DEBUG_REQUIREMENTS = roleplay.dSYM
endif endif
CC ?= clang
CXX ?= clang++
export MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=1 export MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=1
.PHONY: all .PHONY: all
all: roleplay $(SPV_FILES) all: roleplay $(SPV_FILES)
roleplay: $(OBJECTS) roleplay: $(OBJECTS)
$(CPP) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^
%.o: %.cpp %.o: %.cpp
$(CPP) $(CFLAGS) -Wno-nullability-completeness -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-private-field -Wno-unused-variable -c -o $@ $< $(CXX) $(CFLAGS) -std=c++14 -Wno-nullability-completeness -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-private-field -Wno-unused-variable -c -o $@ $<
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<