Update to the latest AMTL (#381)
* Update to latest AMTL. * Update .gitignore for VS2015
This commit is contained in:
parent
b9997eb628
commit
e24b9548d4
84
.gitignore
vendored
84
.gitignore
vendored
|
@ -3,22 +3,76 @@
|
|||
*.exe
|
||||
*.so
|
||||
|
||||
# Files generated by Visual Studio
|
||||
*.aps
|
||||
*.ncb
|
||||
*.sdf
|
||||
# User-specific files
|
||||
*.suo
|
||||
*.user
|
||||
*.opensdf
|
||||
*.opendb
|
||||
*.sln.docstates
|
||||
|
||||
# Build directories
|
||||
Debug
|
||||
Release
|
||||
JITDebug
|
||||
JITRelease
|
||||
JITDebugBinLog
|
||||
JITReleaseBinLog
|
||||
# Build results
|
||||
[Dd]ebug/
|
||||
[Rr]elease/
|
||||
JITDebug/
|
||||
JITRelease/
|
||||
JITDebugBinLog/
|
||||
JITReleaseBinLog/
|
||||
x64/
|
||||
build/
|
||||
[Bb]in/
|
||||
[Oo]bj/
|
||||
build/
|
||||
obj-*/
|
||||
|
||||
# Visual Studio 2015 cache/options directory
|
||||
.vs/
|
||||
.vscode/
|
||||
|
||||
*_i.c
|
||||
*_p.c
|
||||
*.ilk
|
||||
*.meta
|
||||
*.obj
|
||||
*.pch
|
||||
*.pdb
|
||||
*.pgc
|
||||
*.pgd
|
||||
*.rsp
|
||||
*.sbr
|
||||
*.tlb
|
||||
*.tli
|
||||
*.tlh
|
||||
*.tmp
|
||||
*.tmp_proj
|
||||
*.log
|
||||
*.vspscc
|
||||
*.vssscc
|
||||
.builds
|
||||
*.pidb
|
||||
*.log
|
||||
*.scc
|
||||
|
||||
# Visual C++ cache files
|
||||
ipch/
|
||||
*.aps
|
||||
*.ncb
|
||||
*.opendb
|
||||
*.opensdf
|
||||
*.sdf
|
||||
*.cachefile
|
||||
*.VC.db
|
||||
*.VC.VC.opendb
|
||||
|
||||
# Visual Studio profiler
|
||||
*.psess
|
||||
*.vsp
|
||||
*.vspx
|
||||
*.sap
|
||||
|
||||
# Backup & report files from converting an old project file to a newer
|
||||
# Visual Studio version. Backup files are not needed, because we have git ;-)
|
||||
_UpgradeReport_Files/
|
||||
Backup*/
|
||||
UpgradeLog*.XML
|
||||
UpgradeLog*.htm
|
||||
|
||||
# Files generated by Mac OS X Finder
|
||||
.DS_Store
|
||||
|
@ -27,10 +81,6 @@ JITReleaseBinLog
|
|||
Desktop.ini
|
||||
Thumbs.db
|
||||
|
||||
# Build directories
|
||||
build/
|
||||
obj-*/
|
||||
|
||||
# AMXX plugin build related files
|
||||
plugins/compile.dat
|
||||
plugins/compiled/
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
#include "CstrikeItemsInfos.h"
|
||||
#include "CstrikeHacks.h"
|
||||
#include <amtl/am-utility.h>
|
||||
|
||||
CsItemInfo ItemsManager;
|
||||
ItemInfo WeaponsList[MAX_WEAPONS];
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "entity_state.h"
|
||||
#include <amtl/am-vector.h>
|
||||
#include <amtl/am-string.h>
|
||||
#include <amtl/am-algorithm.h>
|
||||
#include <CDetour/detours.h>
|
||||
#include <HLTypeConversion.h>
|
||||
|
||||
|
|
|
@ -15,9 +15,6 @@
|
|||
#include "geoip_natives.h"
|
||||
#include "geoip_util.h"
|
||||
|
||||
#include <amtl/am-string.h>
|
||||
#include <amtl/am-vector.h>
|
||||
|
||||
// native geoip_code2(const ip[], ccode[3]);
|
||||
// Deprecated.
|
||||
static cell AMX_NATIVE_CALL amx_geoip_code2(AMX *amx, cell *params)
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
#include <amtl/am-string.h>
|
||||
#include <amtl/am-vector.h>
|
||||
#include <amtl/am-algorithm.h>
|
||||
|
||||
extern MMDB_s HandleDB;
|
||||
extern ke::Vector<ke::AString> LangList;
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
#include "geoip_util.h"
|
||||
#include "geoip_natives.h"
|
||||
#include <amtl/am-algorithm.h>
|
||||
|
||||
const char GeoIPCountryCode[252][3] =
|
||||
{
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include <stdlib.h> // memalign
|
||||
#include <stdio.h>
|
||||
|
||||
#include <amtl/am-utility.h>
|
||||
#include <amtl/am-bits.h>
|
||||
|
||||
namespace Trampolines
|
||||
{
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit ae57753e79a957d8578421f37043e6bea1603f65
|
||||
Subproject commit 364541372c405ed172e7da778367a0392afdc24f
|
|
@ -110,7 +110,7 @@ public:
|
|||
memory_used_(0)
|
||||
{
|
||||
if (!internal_.init())
|
||||
internal_.reportOutOfMemory();
|
||||
internal_.allocPolicy().reportOutOfMemory();
|
||||
}
|
||||
|
||||
typedef typename Internal::Result Result;
|
||||
|
|
Loading…
Reference in New Issue
Block a user