Skip to content

Commit

Permalink
default platform x86_64-pc-linux-gnu (#68)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
vasyahuyasa authored Jan 14, 2021
1 parent fa03320 commit df54454
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit df54454

Please sign in to comment.