Massive reorganization attempt - part 1

Oh dear, what has DS done now?

dlls/sockets/Makefile

@@ -14,12 +14,12 @@ NAME = sockets
 BIN_SUFFIX_32 = amxx_i386.so
 BIN_SUFFIX_64 = amxx_amd64.so
 
-OBJECTS = amxxmodule.cpp sockets.cpp
+OBJECTS = sdk/amxxmodule.cpp sockets.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)
 
@@ -54,12 +54,12 @@ $(BIN_DIR)/%.o: %.cpp
 all:
 	mkdir -p $(BIN_DIR)
 	mkdir -p $(BIN_DIR)/sdk
-	$(MAKE) geoip
+	$(MAKE) sockets
 
 amd64:
 	$(MAKE) all AMD64=true
 
-geoip: $(OBJ_LINUX)
+sockets: $(OBJ_LINUX)
 	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
 debug:	
@@ -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)
-	

dlls/sockets/msvc7/sockets.vcproj

@@ -20,6 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -69,6 +70,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
@@ -118,31 +120,35 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\sockets.cpp">
+				RelativePath="..\sockets.cpp">
 			</File>
 		</Filter>
 		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			Name="Module SDK"
+			Filter="">
+			<File
+				RelativePath="..\sdk\moduleconfig.h">
+			</File>
+			<File
+				RelativePath="..\sdk\svn_version.h">
+			</File>
 			<Filter
-				Name="SDK"
+				Name="SDK Base"
 				Filter="">
 				<File
-					RelativePath=".\amxxmodule.cpp">
+					RelativePath="..\sdk\amxxmodule.cpp">
 				</File>
 				<File
-					RelativePath=".\amxxmodule.h">
-				</File>
-				<File
-					RelativePath=".\moduleconfig.h">
+					RelativePath="..\sdk\amxxmodule.h">
 				</File>
 			</Filter>
 		</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="Pawn Includes"
+			Filter="">
+			<File
+				RelativePath="..\..\..\plugins\include\sockets.inc">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

dlls/sockets/msvc8/sockets.vcproj

@@ -41,6 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -121,6 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
@@ -190,32 +192,36 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			Name="Module SDK"
 			>
+			<File
+				RelativePath="..\sdk\moduleconfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\sdk\svn_version.h"
+				>
+			</File>
 			<Filter
-				Name="SDK"
+				Name="SDK Base"
 				>
 				<File
-					RelativePath="..\amxxmodule.cpp"
+					RelativePath="..\sdk\amxxmodule.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\amxxmodule.h"
-					>
-				</File>
-				<File
-					RelativePath="..\moduleconfig.h"
+					RelativePath="..\sdk\amxxmodule.h"
 					>
 				</File>
 			</Filter>
 		</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="Pawn Includes"
 			>
+			<File
+				RelativePath="..\..\..\plugins\include\sockets.inc"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>