--- a/Makerules +++ b/Makerules @@ -139,11 +139,11 @@ ifeq ($(OS),MINGW) else ifeq ($(OS),MACOS) HAVE_GLUT := yes SYS_GLUT_CFLAGS := -Wno-deprecated-declarations - SYS_GLUT_LIBS := -framework GLUT -framework OpenGL - CC = xcrun cc - AR = xcrun ar - LD = xcrun ld - RANLIB = xcrun ranlib + SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL + CC ?= xcrun cc + AR ?= xcrun ar + LD ?= xcrun ld + RANLIB ?= xcrun ranlib ifeq (, $(shell which pkg-config)) $(warning "No pkg-config found, install it for proper integration of libcrypto") @@ -154,9 +154,7 @@ else ifeq ($(OS),MACOS) LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) endif endif - -else ifeq ($(OS),Linux) - HAVE_OBJCOPY := yes +endif ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) @@ -229,8 +227,6 @@ else ifeq ($(OS),Linux) PTHREAD_LIBS := -lpthread endif -endif - # The following section has various cross compilation configurations. # # Invoke these as: