izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Support for MacOS on ARM (#456)

Browse Source 
* initial attempt

works on WSL, boutta test on macos

* attempt 2

* Update Makefile
This commit is contained in:
Fazana
2025-02-11 19:44:41 +00:00
committed by GitHub
parent ed4c5ef8cb
commit e73b533cbb
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/Makefile
+11 -1
View File
@@ -5,10 +5,20 @@ CXX := g++
CFLAGS := -I . -Wall -Wextra -Wno-unused-parameter -pedantic -std=c99 $(OPT) -s
# List of specific errors to ignore
IGNORE_W_ERRORS := -Wno-unused-parameter -Wno-misleading-indentation -Wno-extra
CXXFLAGS := -I . -I dkr_assets_tool_src/ -Werror -Wall $(IGNORE_W_ERRORS) -std=c++17 $(OPT) -lpcre2-8
CXXFLAGS := -I . -I dkr_assets_tool_src/ -std=c++17 $(OPT)
LDFLAGS := -lm
PROGRAMS := n64crc dkr_assets_tool
OS := $(shell uname)
# MacOS has a slightly different name for grep, so check to see if it needs to be used.
ifeq ($(OS), Darwin)
CXXFLAGS += -I/opt/homebrew/include
LDFLAGS += -I/opt/homebrew/lib -lpcre2-8
else
CXXFLAGS += -Werror -Wall $(IGNORE_W_ERRORS) -lpcre2-8
endif
BUILD_DIR := dkr_assets_tool_src/_build
ENUMS_HEADER := ../include/enums.h
tools/dkr_assets_tool_src/helpers/fileHelper.h
+1 -1
View File
@@ -14,7 +14,7 @@ namespace fs = std::filesystem;
// Using path as a key doesn't seem to work on raspberry pi OS?
struct PathHash {
std::size_t operator()(const std::filesystem::__cxx11::path& p) const {
std::size_t operator()(const std::filesystem::path& p) const {
return std::filesystem::hash_value(p);
}
};