From 6e6c535519756c89be90330676f2f4a210c14c41 Mon Sep 17 00:00:00 2001 From: Marek Karcz Date: Wed, 13 Feb 2019 04:09:20 -0500 Subject: [PATCH] Update makefile Bug fixes. --- makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 7d04424..88aeafd 100644 --- a/makefile +++ b/makefile @@ -13,7 +13,12 @@ CXXINCS = ifeq ($(SDLBASE),) $(error ***** SDLDIR not set) endif -$(eval $(export HOSTTYPE = $(arch))) +ifneq "$(HOSTTYPE)" "" + $(info ***** HOSTTYPE already set) +else + $(info ***** HOSTTYPE not set. Setting...) + HOSTTYPE = $(shell arch) +endif $(info ***** SDLDIR = $(SDLDIR)) $(info ***** HOSTTYPE = $(HOSTTYPE)) ifeq ($(HOSTTYPE),x86_64) @@ -23,7 +28,7 @@ ifeq ($(HOSTTYPE),x86_64) CXXFLAGS = $(CXXINCS) -std=c++11 -pthread -Wall -pedantic -g3 -fpermissive else $(info ***** 32-bit) - LIBS = -static-libgcc -m32 -g3 -ltermcap -lncurses + LIBS = -static-libgcc -m32 -g3 -ltermcap -lncurses -lpthread CLIBS = -static-libgcc -m32 -g3 CXXFLAGS = $(CXXINCS) -m32 -std=c++11 -pthread -Wall -pedantic -g3 -fpermissive endif