diff --git a/main/dlls/ns_i386.so b/main/dlls/ns_i386.so index ad2174a..081caaf 100644 Binary files a/main/dlls/ns_i386.so and b/main/dlls/ns_i386.so differ diff --git a/main/liblist.gam b/main/liblist.gam index 7a36d3a..5ebfe3c 100644 --- a/main/liblist.gam +++ b/main/liblist.gam @@ -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" diff --git a/main/source/linux/Makefile b/main/source/linux/Makefile index c558b15..c3a35c4 100644 --- a/main/source/linux/Makefile +++ b/main/source/linux/Makefile @@ -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 \ diff --git a/main/source/mod/AvHCurl.cpp b/main/source/mod/AvHCurl.cpp index a520f1e..060e949 100644 --- a/main/source/mod/AvHCurl.cpp +++ b/main/source/mod/AvHCurl.cpp @@ -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(); @@ -545,4 +547,4 @@ void AvHGamerules::DisplayVersioning() } } -#endif //defined(USE_OLDAUTH) \ No newline at end of file +#endif //defined(USE_OLDAUTH)