mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-08-22 22:33:43 -07:00
Allow for overriding the CXX and CC executables
This commit is contained in:
parent
3bf32d1e2e
commit
44eb8d4a88
6 changed files with 8 additions and 8 deletions
|
@ -1,6 +1,6 @@
|
||||||
# Only used for standalone compilation, usually inherits these from the main makefile
|
# Only used for standalone compilation, usually inherits these from the main makefile
|
||||||
|
|
||||||
CXX := g++-12
|
CXX ?= g++
|
||||||
AR := ar
|
AR := ar
|
||||||
FORMAT := clang-format-11
|
FORMAT := clang-format-11
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ LLD ?= 0
|
||||||
WERROR ?= 0
|
WERROR ?= 0
|
||||||
UNAME := $(shell uname)
|
UNAME := $(shell uname)
|
||||||
|
|
||||||
CXX := g++-12
|
CXX ?= g++
|
||||||
|
|
||||||
INC := -I ZAPD -I lib/elfio -I lib/libgfxd -I lib/tinyxml2 -I ZAPDUtils
|
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
|
CXXFLAGS := -fpic -std=c++17 -Wall -Wextra -fno-omit-frame-pointer
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# Only used for standalone compilation, usually inherits these from the main makefile
|
# 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
|
CXXFLAGS ?= -Wall -Wextra -O2 -g -std=c++17
|
||||||
|
|
||||||
SRC_DIRS := $(shell find . -type d -not -path "*build*")
|
SRC_DIRS := $(shell find . -type d -not -path "*build*")
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
CC := gcc-12
|
CC ?= gcc
|
||||||
CFLAGS = -Wall -O2 -g
|
CFLAGS = -Wall -O2 -g
|
||||||
UC_OBJ = uc_f3d.o uc_f3db.o uc_f3dex.o uc_f3dexb.o uc_f3dex2.o
|
UC_OBJ = uc_f3d.o uc_f3db.o uc_f3dex.o uc_f3dexb.o uc_f3dex2.o
|
||||||
OBJ = gfxd.o $(UC_OBJ)
|
OBJ = gfxd.o $(UC_OBJ)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Only used for standalone compilation, usually inherits these from the main makefile
|
# Only used for standalone compilation, usually inherits these from the main makefile
|
||||||
|
|
||||||
CXX := g++-12
|
CXX ?= g++
|
||||||
CC := gcc-12
|
CC ?= gcc
|
||||||
AR := ar
|
AR := ar
|
||||||
FORMAT := clang-format-11
|
FORMAT := clang-format-11
|
||||||
UNAME := $(shell uname)
|
UNAME := $(shell uname)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
CXX := g++-12
|
CXX ?= g++
|
||||||
CC := gcc-12
|
CC ?= gcc
|
||||||
LD := lld
|
LD := lld
|
||||||
AR := ar
|
AR := ar
|
||||||
FORMAT := clang-format-11
|
FORMAT := clang-format-11
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue