MERGE PR 377

sm64pc#377
quentin452 · May 2, 2024 · 9dcffd3 · 9dcffd3
1 parent ddfc438
commit 9dcffd3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Build_clang.sh b/Build_clang.sh
@@ -0,0 +1 @@
+make CC=clang CXX=clang++ CPP=clang-cpp
diff --git a/Makefile b/Makefile
@@ -486,14 +486,14 @@ else ifeq ($(WINDOWS_BUILD),1)
 endif
 
 ifeq ($(WINDOWS_BUILD),1) # fixes compilation in MXE on Linux and WSL
-  CPP := cpp -P
+  CPP ?= cpp -P
   OBJCOPY := objcopy
   OBJDUMP := $(CROSS)objdump
 else ifeq ($(OSX_BUILD),1)
   OBJDUMP := i686-w64-mingw32-objdump
   OBJCOPY := i686-w64-mingw32-objcopy
 else # Linux & other builds
-  CPP := $(CROSS)cpp -P
+  CPP ?= $(CROSS)cpp -P
   OBJCOPY := $(CROSS)objcopy
   OBJDUMP := $(CROSS)objdump
 endif