Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Massive reorganization attempt - part 1

Browse Source 
Oh dear, what has DS done now?
This commit is contained in:
Scott Ehlert
2007-03-13 11:46:03 +00:00
parent e4b01bc066
commit c71be87a3a
238 changed files with 2567 additions and 4903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
dlls/ns/ns/CPlayer.cpp → dlls/ns/CPlayer.cpp
View File

0
dlls/ns/ns/CPlayer.h → dlls/ns/CPlayer.h
View File

0
dlls/ns/ns/CSpawn.cpp → dlls/ns/CSpawn.cpp
View File

0
dlls/ns/ns/CSpawn.h → dlls/ns/CSpawn.h
View File

10
dlls/ns/ns/Makefile → dlls/ns/Makefile
View File

@ -1,8 +1,8 @@
#(C)2004-2005 AMX Mod X Development Team
# Makefile written by David "BAILOPAN" Anderson
HLSDK = ../../../../hlsdk
MM_ROOT = ../../../metamod/metamod
HLSDK = ../../../hlsdk
MM_ROOT = ../../metamod/metamod
### EDIT BELOW FOR OTHER PROJECTS ###
@ -13,12 +13,12 @@ NAME = ns
BIN_SUFFIX = amxx_i386.so
OBJECTS = amxxmodule.cpp CPlayer.cpp CSpawn.cpp NMisc.cpp NPData.cpp hookedfunctions.cpp
OBJECTS = sdk/amxxmodule.cpp CPlayer.cpp CSpawn.cpp NMisc.cpp NPData.cpp hookedfunctions.cpp
LINK =
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$(HLSDK)/pm_shared
-I$(MM_ROOT) -I$(HLSDK)/common -I$(HLSDK)/pm_shared -Isdk
GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
@ -59,8 +59,10 @@ debug:
default: all
clean:
rm -rf Release/sdk/*.o
rm -rf Release/*.o
rm -rf Release/$(NAME)_$(BIN_SUFFIX)
rm -rf Debug/sdk/*.o
rm -rf Debug/*.o
rm -rf Debug/$(NAME)_$(BIN_SUFFIX)

0
dlls/ns/ns/NMisc.cpp → dlls/ns/NMisc.cpp
View File

0
dlls/ns/ns/NPData.cpp → dlls/ns/NPData.cpp
View File

0
dlls/ns/ns/amxxapi.h → dlls/ns/amxxapi.h
View File

0
dlls/ns/ns/hookedfunctions.cpp → dlls/ns/hookedfunctions.cpp
View File

0
dlls/ns/ns/ns.sln → dlls/ns/msvc7/ns.sln
View File

82
dlls/ns/ns/ns.vcproj → dlls/ns/msvc7/ns.vcproj
View File

@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""c:\Documents and Settings\Steve\My Documents\include\metamod";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\common";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\engine";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\dlls";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\pm_shared""
AdditionalIncludeDirectories="..\sdk"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="4"
@ -86,7 +86,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/I "
Optimization="0"
AdditionalIncludeDirectories=""c:\Documents and Settings\Steve\My Documents\include\metamod";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\common";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\engine";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\dlls";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\pm_shared""
AdditionalIncludeDirectories="..\sdk"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="5"
@ -97,7 +97,7 @@
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
DebugInformationFormat="3"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
@ -147,80 +147,74 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
RelativePath=".\amxxmodule.cpp">
RelativePath="..\CPlayer.cpp">
</File>
<File
RelativePath=".\CPlayer.cpp">
RelativePath="..\CSpawn.cpp">
</File>
<File
RelativePath=".\CSpawn.cpp">
RelativePath="..\hookedfunctions.cpp">
</File>
<File
RelativePath="hookedfunctions.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ns_amxx_EXPORTS;$(NoInherit)"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ns_amxx_EXPORTS;$(NoInherit)"
BasicRuntimeChecks="3"/>
</FileConfiguration>
RelativePath="..\NMisc.cpp">
</File>
<File
RelativePath=".\NMisc.cpp">
</File>
<File
RelativePath=".\NPData.cpp">
RelativePath="..\NPData.cpp">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath=".\amxxmodule.h">
RelativePath="..\CPlayer.h">
</File>
<File
RelativePath=".\CPlayer.h">
RelativePath="..\CSpawn.h">
</File>
<File
RelativePath=".\CSpawn.h">
RelativePath="..\ns.h">
</File>
<File
RelativePath=".\moduleconfig.h">
RelativePath="..\ns_const.h">
</File>
<File
RelativePath=".\ns.h">
RelativePath="..\plugin.h">
</File>
<File
RelativePath=".\ns_const.h">
</File>
<File
RelativePath="plugin.h">
</File>
<File
RelativePath="utilfunctions.h">
RelativePath="..\utilfunctions.h">
</File>
</Filter>
<Filter
Name="Miscellaneous"
Name="Module SDK"
Filter="">
<File
RelativePath="..\sdk\moduleconfig.h">
</File>
<File
RelativePath="..\sdk\svn_version.h">
</File>
<Filter
Name="SDK Base"
Filter="">
<File
RelativePath="..\sdk\amxxmodule.cpp">
</File>
<File
RelativePath="..\sdk\amxxmodule.h">
</File>
</Filter>
</Filter>
<Filter
Name="Pawn Includes"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
<File
RelativePath="..\..\plugins\include\ns.inc">
RelativePath="..\..\..\plugins\include\ns.inc">
</File>
<File
RelativePath="..\..\plugins\include\ns2amx.inc">
RelativePath="..\..\..\plugins\include\ns2amx.inc">
</File>
<File
RelativePath="..\..\plugins\include\ns_const.inc">
RelativePath="..\..\..\plugins\include\ns_const.inc">
</File>
</Filter>
</Files>

0
dlls/ns/ns/msvc8/ns.sln → dlls/ns/msvc8/ns.sln
View File

64
dlls/ns/ns/msvc8/ns.vcproj → dlls/ns/msvc8/ns.vcproj
View File

@ -49,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="&quot;c:\Documents and Settings\Steve\My Documents\include\metamod&quot;;&quot;c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\common&quot;;&quot;c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\engine&quot;;&quot;c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\dlls&quot;;&quot;c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\pm_shared&quot;"
AdditionalIncludeDirectories="..\sdk"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
StringPooling="true"
RuntimeLibrary="0"
@ -142,8 +142,9 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/I "
Optimization="0"
AdditionalIncludeDirectories="&quot;c:\Documents and Settings\Steve\My Documents\include\metamod&quot;;&quot;c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\common&quot;;&quot;c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\engine&quot;;&quot;c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\dlls&quot;;&quot;c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\pm_shared&quot;"
AdditionalIncludeDirectories="..\sdk"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@ -212,10 +213,6 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\amxxmodule.cpp"
>
</File>
<File
RelativePath="..\CPlayer.cpp"
>
@ -227,27 +224,6 @@
<File
RelativePath="..\hookedfunctions.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ns_amxx_EXPORTS;$(NoInherit)"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ns_amxx_EXPORTS;$(NoInherit)"
BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\NMisc.cpp"
@ -262,10 +238,6 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath="..\amxxmodule.h"
>
</File>
<File
RelativePath="..\CPlayer.h"
>
@ -274,10 +246,6 @@
RelativePath="..\CSpawn.h"
>
</File>
<File
RelativePath="..\moduleconfig.h"
>
</File>
<File
RelativePath="..\ns.h"
>
@ -296,7 +264,31 @@
</File>
</Filter>
<Filter
Name="Miscellaneous"
Name="Module SDK"
>
<File
RelativePath="..\sdk\moduleconfig.h"
>
</File>
<File
RelativePath="..\sdk\svn_version.h"
>
</File>
<Filter
Name="SDK Base"
>
<File
RelativePath="..\sdk\amxxmodule.cpp"
>
</File>
<File
RelativePath="..\sdk\amxxmodule.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="Pawn Includes"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
<File

0
dlls/ns/ns/ns.h → dlls/ns/ns.h
View File

0
dlls/ns/ns/ns_const.h → dlls/ns/ns_const.h
View File

0
dlls/ns/ns/res_plugin.rc → dlls/ns/res_plugin.rc
View File

2
dlls/ns/ns/amxxmodule.cpp → dlls/ns/sdk/amxxmodule.cpp
View File

@ -2773,7 +2773,7 @@ void ValidateMacros_DontCallThis_Smiley()
MF_FindLibrary(NULL, LibType_Class);
MF_AddLibraries(NULL, LibType_Class, NULL);
MF_RemoveLibraries(NULL);
MF_OverrideNatives(NULL);
MF_OverrideNatives(NULL, "");
}
#endif

0
dlls/ns/ns/amxxmodule.h → dlls/ns/sdk/amxxmodule.h
View File

0
dlls/ns/ns/moduleconfig.h → dlls/ns/sdk/moduleconfig.h
View File

0
dlls/ns/ns/svn_version.h → dlls/ns/sdk/svn_version.h
View File

0
dlls/ns/ns/svn_version.tpl → dlls/ns/sdk/svn_version.tpl
View File

0
dlls/ns/ns/utilfunctions.h → dlls/ns/utilfunctions.h
View File