ensl
/
NS
mirror of https://github.com/ENSL/NS.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build 252 

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@252 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
puzl 2005-07-08 10:43:40 +00:00
parent 6399c545a8
commit 39716e42db
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
main/dlls/ns_i386.so
View File

Binary file not shown.

2
main/liblist.gam
View File

@ -2,7 +2,7 @@
// Natural Selection //
// by Charlie Cleveland //
////////////////////////////
game "Natural Selection 3.1 (PT build 212)"
game "Natural Selection 3.1 (PT build 252)"
url_info "www.natural-selection.org"
url_dl "http://www.natural-selection.org/"
version "v3.0"

7
main/source/linux/Makefile
View File

@ -31,7 +31,7 @@ TEXT_OBJDIR=$(TEXT_SRCDIR)/obj
UTIL_OBJDIR=$(UTIL_SRCDIR)/obj
OUTPUT_DIR=../../hlds_l/ns/dlls
BASE_CFLAGS=-Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DAVH_SERVER -DLINUX -DVALVE_DLL -DQUIVER -DVOXEL -DQUAKE2 -DDEDICATED -DSWDS -D_STLP_USE_GLIBC -DAVH_PLAYTEST_BUILD
BASE_CFLAGS=-Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DAVH_SERVER -DLINUX -DVALVE_DLL -DQUIVER -DVOXEL -DQUAKE2 -DDEDICATED -DSWDS -D_STLP_USE_GLIBC -DAVH_PLAYTEST_BUILD -DUSE_OLDAUTH -DAVH_SECURE_PRERELEASE_BUILD
#full optimization
CFLAGS=$(BASE_CFLAGS) -w -Wall -nostdinc++ -ffor-scope -fPIC -mcpu=i486 -O3 -pipe -funroll-loops -fdelayed-branch -malign-loops=4 -malign-jumps=4 -malign-functions=4
@ -41,7 +41,7 @@ CFLAGS=$(BASE_CFLAGS) -w -Wall -nostdinc++ -ffor-scope -fPIC -mcpu=i486 -O3 -pip
# add base directory (CGC)
INCLUDEDIRS=-I$(LIBBASE) -I. -I$(LIBBASE)/include -I$(LIBBASE)/include/stlport -I$(LIBBASE)/include/particle -I$(LIBBASE)/include/lua -I../dlls -I../engine -I../common -I../mod -I../game_shared -I../pm_shared -I.. -I/usr/include/c++/3.3/i486-linux -I/usr/include/c++/3.3 -I/usr/include/c++
INCLUDEDIRS=-I$(LIBBASE) -I. -I$(LIBBASE)/include/curl -I$(LIBBASE)/include -I$(LIBBASE)/include/stlport -I$(LIBBASE)/include/particle -I$(LIBBASE)/include/lua -I../dlls -I../engine -I../common -I../mod -I../game_shared -I../pm_shared -I.. -I/usr/include/c++/3.3/i486-linux -I/usr/include/c++/3.3 -I/usr/include/c++
LINKDIRS= -L$(LIBBASE)/release
SHLIBEXT=so
@ -50,7 +50,7 @@ LDPRELIBS= $(CFLAGS) -shared \
-Wl,-Map,ns_map.txt \
$(LINKDIRS)
LDPOSTLIBS= -Wl,-Bstatic -lstlport_gcc -lstdc++ -lsupc++ -llua -llualib -lparticleMP\
LDPOSTLIBS= -Wl,-Bstatic -lstlport_gcc -lstdc++ -lsupc++ -llua -llualib -lparticleMP -lcurl \
-Wl,-Bdynamic -lm -lgcc -lgcc_eh
# -lgcc -lgcc_eh -lelf
DO_CC=$(CC) $(CFLAGS) $(INCLUDEDIRS) -o $@ -c $<
@ -155,6 +155,7 @@ OBJ = \
$(MOD_OBJDIR)/AvHBlink.o \
$(MOD_OBJDIR)/AvHBuildable.o \
$(MOD_OBJDIR)/AvHBuildingGun.o \
$(MOD_OBJDIR)/AvHCurl.o \
$(MOD_OBJDIR)/AvHClaws.o \
$(MOD_OBJDIR)/AvHCloakable.o \
$(MOD_OBJDIR)/AvHConsoleCommands.o \

4
main/source/mod/AvHCurl.cpp
View File

@ -24,7 +24,9 @@
#include "util/Tokenizer.h"
#include "mod/AvHGamerules.h"
#include "mod/AvHServerUtil.h"
#ifndef LINUX
#define CURL_STATICLIB
#endif
#include "curl.h"
extern cvar_t avh_serverops;
@ -358,7 +360,7 @@ string BuildUserPassword()
CURLcode PopulateChunkFromURL(const string& inURL, MemoryStruct& outChunk)
{
const int kCurlTimeout = 5;
const int kCurlTimeout = 8;
// init the curl session
CURL* theCurlHandle = curl_easy_init();