From df54454c646098bf8c42b251519a232546f5e87b Mon Sep 17 00:00:00 2001 From: Vasya Date: Thu, 14 Jan 2021 22:55:45 +0300 Subject: [PATCH] default platform x86_64-pc-linux-gnu (#68) * Use maxminddb lib instead legacy geoip * Update docs * Update win32 makefile * Support geoip legacy and geoip2 * libmaxminddb 1.4.3 * make geoip compiling * set vars in makefile via env * use geoip lib package distribution * ignore generated .libs * compile .cpp with g++ and .c with cc * travisci more abvious stage names * remove unncesary svn revision stage * make clean as prefix * check for empty geodb * use geoip2 database format by default * regenereate configure befoure build * copy geoip database * do not build uneccesary geoip binaries * Always use enet from source tree * platform can be defined via env, removed unnecasary freebsd postfix * posix basename * makefile cleanup * fix docker build * set default platform to x86_64-pc-linux-gnu * fixed linux platform detection --- src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 0409627..56d5f07 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,7 @@ INCLUDES= -Ienet/include -Ishared -Iengine -Ifpsgame -Imod -Imod/hashlib2plus/sr STRIP?=strip -PLATFORM?=$(shell uname -s) +PLATFORM?=x86_64-pc-linux-gnu ifneq (,$(findstring MINGW,$(PLATFORM))) ifneq (,$(findstring 64,$(PLATFORM))) @@ -109,7 +109,7 @@ override CXXFLAGS+= -DSQLITE_THREADSAFE=1 override INCLUDES+= -Imod/sqlite3 #linux-only libs -ifeq ($(PLATFORM),Linux) +ifneq (,$(findstring linux,$(PLATFORM))) override SERVER_LIBS+= -ldl -lpthread endif override SERVER_OBJS+= mod/sqlite3/sqlite3-standalone.o