Massive reorganization attempt - part 1

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

View File

@ -14,12 +14,12 @@ NAME = geoip
BIN_SUFFIX_32 = amxx_i386.so
BIN_SUFFIX_64 = amxx_amd64.so
OBJECTS = GeoIP.c amxxmodule.cpp geoip_amxx.cpp
OBJECTS = sdk/amxxmodule.cpp GeoIP.c geoip_amxx.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$(MM_ROOT) -I$(HLSDK)/common -Isdk
GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
@ -60,6 +60,7 @@ $(BIN_DIR)/%.o: %.c
all:
mkdir -p $(BIN_DIR)
mkdir -p $(BIN_DIR)/sdk
$(MAKE) geoip
amd64:
@ -74,9 +75,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)

View File

@ -19,6 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\sdk"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@ -26,7 +27,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;GEOIP_EXPORTS"
RuntimeLibrary="4"
UsePrecompiledHeader="0"
@ -118,44 +120,53 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath=".\geoip_amxx.cpp">
RelativePath="..\geoip_amxx.cpp">
</File>
<Filter
Name="SDK"
Filter="">
<File
RelativePath=".\amxxmodule.cpp">
</File>
<File
RelativePath=".\amxxmodule.h">
</File>
<File
RelativePath=".\moduleconfig.h">
</File>
</Filter>
<Filter
Name="GeoIP"
Filter="">
<File
RelativePath=".\GeoIP.c">
</File>
<File
RelativePath=".\GeoIP.h">
</File>
</Filter>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
RelativePath=".\geoip_amxx.h">
RelativePath="..\geoip_amxx.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="GeoIP"
Filter="">
<File
RelativePath="..\GeoIP.c">
</File>
<File
RelativePath="..\GeoIP.h">
</File>
</Filter>
<Filter
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="">
<File
RelativePath="..\..\..\plugins\include\geoip.inc">
</File>
</Filter>
</Files>
<Globals>

View File

@ -41,6 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\sdk"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -49,7 +50,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;GEOIP_EXPORTS"
RuntimeLibrary="0"
RuntimeTypeInfo="false"
@ -189,34 +191,6 @@
RelativePath="..\geoip_amxx.cpp"
>
</File>
<Filter
Name="SDK"
>
<File
RelativePath="..\amxxmodule.cpp"
>
</File>
<File
RelativePath="..\amxxmodule.h"
>
</File>
<File
RelativePath="..\moduleconfig.h"
>
</File>
</Filter>
<Filter
Name="GeoIP"
>
<File
RelativePath="..\GeoIP.c"
>
</File>
<File
RelativePath="..\GeoIP.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="Header Files"
@ -229,10 +203,48 @@
</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="GeoIP"
>
<File
RelativePath="..\GeoIP.c"
>
</File>
<File
RelativePath="..\GeoIP.h"
>
</File>
</Filter>
<Filter
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"
>
<File
RelativePath="..\..\..\plugins\include\geoip.inc"
>
</File>
</Filter>
</Files>
<Globals>