diff --git a/OTRExporter/OTRExporter/Makefile b/OTRExporter/OTRExporter/Makefile index 893828845..e935a7ae1 100644 --- a/OTRExporter/OTRExporter/Makefile +++ b/OTRExporter/OTRExporter/Makefile @@ -1,6 +1,6 @@ # Only used for standalone compilation, usually inherits these from the main makefile -CXX := g++-12 +CXX ?= g++ AR := ar FORMAT := clang-format-11 diff --git a/ZAPDTR/Makefile b/ZAPDTR/Makefile index 673ff6934..b8e2a0a4a 100644 --- a/ZAPDTR/Makefile +++ b/ZAPDTR/Makefile @@ -9,7 +9,7 @@ LLD ?= 0 WERROR ?= 0 UNAME := $(shell uname) -CXX := g++-12 +CXX ?= g++ INC := -I ZAPD -I lib/elfio -I lib/libgfxd -I lib/tinyxml2 -I ZAPDUtils CXXFLAGS := -fpic -std=c++17 -Wall -Wextra -fno-omit-frame-pointer diff --git a/ZAPDTR/ZAPDUtils/Makefile b/ZAPDTR/ZAPDUtils/Makefile index 503197373..b9c4e29ad 100644 --- a/ZAPDTR/ZAPDUtils/Makefile +++ b/ZAPDTR/ZAPDUtils/Makefile @@ -1,5 +1,5 @@ # Only used for standalone compilation, usually inherits these from the main makefile -CXX := g++-12 +CXX ?= g++ CXXFLAGS ?= -Wall -Wextra -O2 -g -std=c++17 SRC_DIRS := $(shell find . -type d -not -path "*build*") diff --git a/ZAPDTR/lib/libgfxd/Makefile b/ZAPDTR/lib/libgfxd/Makefile index ba06fdb2a..5c3edbef4 100644 --- a/ZAPDTR/lib/libgfxd/Makefile +++ b/ZAPDTR/lib/libgfxd/Makefile @@ -1,4 +1,4 @@ -CC := gcc-12 +CC ?= gcc CFLAGS = -Wall -O2 -g UC_OBJ = uc_f3d.o uc_f3db.o uc_f3dex.o uc_f3dexb.o uc_f3dex2.o OBJ = gfxd.o $(UC_OBJ) diff --git a/libultraship/Makefile b/libultraship/Makefile index 6ba3d0373..9f269ea61 100644 --- a/libultraship/Makefile +++ b/libultraship/Makefile @@ -1,7 +1,7 @@ # Only used for standalone compilation, usually inherits these from the main makefile -CXX := g++-12 -CC := gcc-12 +CXX ?= g++ +CC ?= gcc AR := ar FORMAT := clang-format-11 UNAME := $(shell uname) diff --git a/soh/Makefile b/soh/Makefile index 946731c5c..14b799d46 100644 --- a/soh/Makefile +++ b/soh/Makefile @@ -1,5 +1,5 @@ -CXX := g++-12 -CC := gcc-12 +CXX ?= g++ +CC ?= gcc LD := lld AR := ar FORMAT := clang-format-11