dahjah/hostile-takeover
1
0
Fork 0
mirror of https://github.com/spiffcode/hostile-takeover.git synced 2026-05-12 18:29:37 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch OS X build to 64 bit and fix a merge bug

Browse Source
This commit is contained in:
Scott Ludwig 2016-01-01 23:09:50 -08:00
parent 35da7845ce
commit bbb2b60a2a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/Makefile
View File

@ -3,8 +3,8 @@
# gcc is silent.
UNAME := $(shell uname)
ifeq ($(UNAME), Darwin)
PRE_CC=g++ -m32
CC=$(PRE_CC) -Wshorten-64-to-32 -DOSX
PRE_CC=g++
CC=$(PRE_CC) -DOSX
endif
ifeq ($(UNAME), Linux)
PRE_CC=g++
@ -84,5 +84,5 @@ $(YAJLFILESCPP:%=$(OUTDIR)/%.o): $(YAJLFILESCPP:%=../yajl/wrapper/%.cpp)
$(CC) $(CPPFLAGS) -c $(<D)/$(*F).cpp -o $@
$(YAJLFILESC:%=$(OUTDIR)/%.o): $(YAJLFILESC:%=../yajl/src/%.c)
$(CC) $(CPPFLAGS) -c $(<D)/$(*F).c -o $@
$(CC) $(CPPFLAGS) -x c -c $(<D)/$(*F).c -o $@

1
server/player.cpp
View File

@ -33,7 +33,6 @@ void Player::Init(Pid pid) {
memset(alatr_, 0, sizeof(alatr_));
memset(&ws_, 0, sizeof(ws_));
memset(did_, 0, sizeof(did_));
return true;
}
void Player::SetEndpoint(Endpoint *endpoint) {