Massive reorganization attempt - part 1
Oh dear, what has DS done now?
This commit is contained in:
Scott Ehlert
@@ -14,12 +14,12 @@ NAME = nvault
|
||||
BIN_SUFFIX_32 = amxx_i386.so
|
||||
BIN_SUFFIX_64 = amxx_amd64.so
|
||||
|
||||
OBJECTS = amxxmodule.cpp amxxapi.cpp Binary.cpp Journal.cpp NVault.cpp
|
||||
OBJECTS = sdk/amxxmodule.cpp amxxapi.cpp Binary.cpp Journal.cpp NVault.cpp
|
||||
|
||||
LINK = /lib/libgcc_eh.a /lib/libstdc++-3.4.a
|
||||
|
||||
INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \
|
||||
-I$(MM_ROOT) -I$(HLSDK)/common
|
||||
-I$(MM_ROOT) -I$(HLSDK)/common -Isdk
|
||||
|
||||
GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
|
||||
|
||||
@@ -68,10 +68,11 @@ debug:
|
||||
default: all
|
||||
|
||||
clean:
|
||||
rm -rf Release/sdk/*.o
|
||||
rm -rf Release/*.o
|
||||
rm -rf Release/$(NAME)_$(BIN_SUFFIX_32)
|
||||
rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
|
||||
rm -rf Debug/sdk/*.o
|
||||
rm -rf Debug/*.o
|
||||
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
|
||||
rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\sdk"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NVAULT_EXPORTS"
|
||||
MinimalRebuild="TRUE"
|
||||
ExceptionHandling="TRUE"
|
||||
@@ -28,7 +29,7 @@
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="FALSE"
|
||||
DebugInformationFormat="4"/>
|
||||
DebugInformationFormat="3"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
@@ -69,6 +70,7 @@
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\sdk"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NVAULT_EXPORTS"
|
||||
RuntimeLibrary="4"
|
||||
StructMemberAlignment="3"
|
||||
@@ -118,25 +120,16 @@
|
||||
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
|
||||
<File
|
||||
RelativePath=".\amxxapi.cpp">
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ExceptionHandling="FALSE"
|
||||
RuntimeLibrary="5"
|
||||
StructMemberAlignment="3"
|
||||
Detect64BitPortabilityProblems="FALSE"/>
|
||||
</FileConfiguration>
|
||||
RelativePath="..\amxxapi.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Binary.cpp">
|
||||
RelativePath="..\Binary.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Journal.cpp">
|
||||
RelativePath="..\Journal.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\NVault.cpp">
|
||||
RelativePath="..\NVault.cpp">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
@@ -144,52 +137,68 @@
|
||||
Filter="h;hpp;hxx;hm;inl;inc;xsd"
|
||||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
|
||||
<File
|
||||
RelativePath=".\amxxapi.h">
|
||||
RelativePath="..\amxxapi.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Binary.h">
|
||||
RelativePath="..\Binary.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\compat.h">
|
||||
RelativePath="..\compat.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\CQueue.h">
|
||||
RelativePath="..\IVault.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\IVault.h">
|
||||
RelativePath="..\Journal.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Journal.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\NVault.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sh_list.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\sh_tinyhash.h">
|
||||
RelativePath="..\NVault.h">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Resource Files"
|
||||
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
|
||||
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="SDK"
|
||||
Name="Module SDK"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath=".\amxxmodule.cpp">
|
||||
RelativePath="..\sdk\moduleconfig.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\amxxmodule.h">
|
||||
RelativePath="..\sdk\svn_version.h">
|
||||
</File>
|
||||
<Filter
|
||||
Name="AMXX STL"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\sdk\CQueue.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\CString.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\CVector.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\sh_list.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\sh_tinyhash.h">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="SDK Base"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath="..\sdk\amxxmodule.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\amxxmodule.h">
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Pawn Includes"
|
||||
Filter="">
|
||||
<File
|
||||
RelativePath=".\CString.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\moduleconfig.h">
|
||||
RelativePath="..\..\..\plugins\include\nvault.inc">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
@@ -41,6 +41,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\sdk"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NVAULT_EXPORTS"
|
||||
MinimalRebuild="true"
|
||||
ExceptionHandling="1"
|
||||
@@ -51,7 +52,7 @@
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
Detect64BitPortabilityProblems="false"
|
||||
DebugInformationFormat="4"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
@@ -122,6 +123,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\sdk"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NVAULT_EXPORTS"
|
||||
RuntimeLibrary="0"
|
||||
StructMemberAlignment="3"
|
||||
@@ -188,17 +190,6 @@
|
||||
<File
|
||||
RelativePath="..\amxxapi.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
ExceptionHandling="0"
|
||||
RuntimeLibrary="1"
|
||||
StructMemberAlignment="3"
|
||||
Detect64BitPortabilityProblems="false"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\Binary.cpp"
|
||||
@@ -230,10 +221,6 @@
|
||||
RelativePath="..\compat.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\CQueue.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\IVault.h"
|
||||
>
|
||||
@@ -246,38 +233,60 @@
|
||||
RelativePath="..\NVault.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sh_list.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sh_tinyhash.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Resource Files"
|
||||
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
|
||||
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
|
||||
Name="Module SDK"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\sdk\moduleconfig.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\svn_version.h"
|
||||
>
|
||||
</File>
|
||||
<Filter
|
||||
Name="AMXX STL"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\sdk\CQueue.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\CString.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\CVector.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\sh_list.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\sh_tinyhash.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="SDK Base"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\sdk\amxxmodule.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sdk\amxxmodule.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="SDK"
|
||||
Name="Pawn Includes"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\amxxmodule.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\amxxmodule.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\CString.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\moduleconfig.h"
|
||||
RelativePath="..\..\..\plugins\include\nvault.inc"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
/* nVault
|
||||
*
|
||||
* A binary (hash table) vault with journaling.
|
||||
* (C)2005 David "BAILOPAN" Anderson
|
||||
*/
|
||||
|
||||
#if defined _nvault_included
|
||||
#endinput
|
||||
#endif
|
||||
#define _nvault_included
|
||||
|
||||
/* Opens a vault and returns an id to it
|
||||
* The vault name is appended with ".nvt" and stored in
|
||||
* datadir/vault.
|
||||
*/
|
||||
native vault_open(const name[]);
|
||||
|
||||
/* Reads from a vault.
|
||||
* No extra params - gets as an int
|
||||
* One extra param - Float byref
|
||||
* Two extra params - gets as a string
|
||||
*/
|
||||
native nvault_get(id, const key[], ...);
|
||||
|
||||
/* Reads from a vault, includes time
|
||||
* Parameter format same as nvault_get()
|
||||
*/
|
||||
native nvault_timeget(id, const key[], &time, ...);
|
||||
|
||||
/* Sets a key/value pair
|
||||
* valFmt is formatted according to format()
|
||||
*/
|
||||
native nvault_set(id, const key[], const valFmt[], {Float,_}:...);
|
||||
|
||||
/* Sets a permanent key/value pair
|
||||
* A permanent key isn't timestamped, so it can be invulnerable to pruning.
|
||||
*/
|
||||
native nvault_pset(id, const key[], const valFmt[], {Float,_}:...);
|
||||
|
||||
|
||||
/* Sets a data under given key. */
|
||||
native set_vaultdata(const key[], const data[] = "" );
|
||||
|
||||
/* Removes a key from vault.*/
|
||||
native remove_vaultdata(const key[]);
|
||||
|
||||
/* Checks if a key exists in the vault.*/
|
||||
native vaultdata_exists(const key[]);
|
||||
Reference in New Issue
Block a user