Whoa, amb1941: All of AMX Mod X is now officially moved over to Visual Studio 2005 (MSVC 8)

Also did the following: * Removed -fPIC from all Linux makefiles * AMXX build tool now also moved over to VS 2005 * AMXX build tool binary renamed from "AMXXRelease" to "builder" * MSVC project files now can use environment variables to point to the paths of the Metamod headers and HL SDK: $(METAMOD) and $(HLSDK) respectively
2008-08-16 09:48:39 +00:00
parent 626bfe5240
commit 0dc6a4a5dd
140 changed files with 1245 additions and 6282 deletions
--- a/dlls/hamsandwich/DataHandler.cpp
+++ b/dlls/hamsandwich/DataHandler.cpp
@ -26,7 +26,7 @@
 *  you do not wish to do so, delete this exception statement from your
 *  version.
 */
-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"

 #include "CVector.h"
 #include "CString.h"
--- a/dlls/hamsandwich/Makefile
+++ b/dlls/hamsandwich/Makefile
@ -40,7 +40,7 @@ else
 	CFLAGS = $(OPT_FLAGS)
 endif

-CFLAGS += -fPIC -Wall -Wno-non-virtual-dtor -fno-exceptions -DHAVE_STDINT_H -fno-rtti -Werror -m32
+CFLAGS += -Wall -Wno-non-virtual-dtor -fno-exceptions -DHAVE_STDINT_H -fno-rtti -Werror -m32

 BINARY = $(NAME)_$(BIN_SUFFIX)
 CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
--- a/dlls/hamsandwich/amxx_api.cpp
+++ b/dlls/hamsandwich/amxx_api.cpp
@ -27,8 +27,8 @@
 *  version.
 */

+#include "amxxmodule.h"
 #include <extdll.h>
-#include "sdk/amxxmodule.h"

 #include "NEW_Util.h"
 #include "CVector.h"
--- a/dlls/hamsandwich/call_funcs.cpp
+++ b/dlls/hamsandwich/call_funcs.cpp
@ -26,7 +26,7 @@
 *  you do not wish to do so, delete this exception statement from your
 *  version.
 */
-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"

 #include "offsets.h"
 #include "ham_utils.h"
--- a/dlls/hamsandwich/config_parser.cpp
+++ b/dlls/hamsandwich/config_parser.cpp
@ -26,7 +26,7 @@
 *  you do not wish to do so, delete this exception statement from your
 *  version.
 */
-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"

 #include "ham_const.h"
 #include "hooklist.h"
--- a/dlls/hamsandwich/forward.h
+++ b/dlls/hamsandwich/forward.h
@ -26,7 +26,7 @@
 *  you do not wish to do so, delete this exception statement from your
 *  version.
 */
-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"

 #ifndef FORWARD_H
 #define FORWARD_H
--- a/dlls/hamsandwich/ham_utils.h
+++ b/dlls/hamsandwich/ham_utils.h
@ -30,7 +30,7 @@
 #ifndef HAM_UTILS_H
 #define HAM_UTILS_H

-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"
 #include "offsets.h"
 #include "NEW_Util.h"

--- a/dlls/hamsandwich/hook_callbacks.cpp
+++ b/dlls/hamsandwich/hook_callbacks.cpp
@ -32,7 +32,7 @@
 #include <string.h>

 #include <extdll.h>
-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"



--- a/dlls/hamsandwich/hook_create.cpp
+++ b/dlls/hamsandwich/hook_create.cpp
@ -26,7 +26,7 @@
 *  you do not wish to do so, delete this exception statement from your
 *  version.
 */
-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"

 int Create_Void_Void(AMX *amx, const char *func)
 {
--- a/dlls/hamsandwich/hook_native.cpp
+++ b/dlls/hamsandwich/hook_native.cpp
@ -32,7 +32,7 @@
 #include <string.h>

 #include <extdll.h>
-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"


 #include "CVector.h"
--- a/dlls/hamsandwich/msvc7/hamsandwich.sln
+++ b/dlls/hamsandwich/msvc7/hamsandwich.sln
@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hamsandwich", "hamsandwich.vcproj", "{5E393C37-22F2-4CA2-9022-6400DC582447}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{5E393C37-22F2-4CA2-9022-6400DC582447}.Debug.ActiveCfg = Debug|Win32
-		{5E393C37-22F2-4CA2-9022-6400DC582447}.Debug.Build.0 = Debug|Win32
-		{5E393C37-22F2-4CA2-9022-6400DC582447}.Release.ActiveCfg = Release|Win32
-		{5E393C37-22F2-4CA2-9022-6400DC582447}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5E393C37-22F2-4CA2-9022-6400DC582447}.Debug|Win32.ActiveCfg = Release|Win32
-		{5E393C37-22F2-4CA2-9022-6400DC582447}.Debug|Win32.Build.0 = Release|Win32
-		{5E393C37-22F2-4CA2-9022-6400DC582447}.Release|Win32.ActiveCfg = Release|Win32
-		{5E393C37-22F2-4CA2-9022-6400DC582447}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/dlls/hamsandwich/msvc7/hamsandwich.vcproj
+++ b/dlls/hamsandwich/msvc7/hamsandwich.vcproj
@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="hamsandwich"
-	ProjectGUID="{5E393C37-22F2-4CA2-9022-6400DC582447}"
-	RootNamespace="hamsandwich"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\hlsdk\dlls;..\..\..\..\hlsdk\common;..\..\..\..\hlsdk\engine\;..\..\..\..\hlsdk\pm_shared; ..\..\..\metamod\metamod"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="FALSE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/hamsandwich_amxx.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/hamsandwich.pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/hamsandwich.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\hlsdk\dlls;..\..\..\..\hlsdk\common;..\..\..\..\hlsdk\engine\;..\..\..\..\hlsdk\pm_shared; ..\..\..\metamod\metamod"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="FALSE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/hamsandwich_amxx.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/hamsandwich.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Hooks">
-			<File
-				RelativePath="..\call_funcs.cpp">
-			</File>
-			<File
-				RelativePath="..\call_funcs.h">
-			</File>
-			<File
-				RelativePath="..\forward.h">
-			</File>
-			<File
-				RelativePath="..\hook.h">
-			</File>
-			<File
-				RelativePath="..\hook_callbacks.cpp">
-			</File>
-			<File
-				RelativePath="..\hook_callbacks.h">
-			</File>
-			<File
-				RelativePath="..\hook_create.cpp">
-			</File>
-			<File
-				RelativePath="..\hook_create.h">
-			</File>
-			<File
-				RelativePath="..\hook_native.cpp">
-			</File>
-			<File
-				RelativePath="..\hooklist.h">
-			</File>
-			<File
-				RelativePath="..\typetocell.h">
-			</File>
-			<Filter
-				Name="Trampolines">
-				<File
-					RelativePath="..\Trampolines.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="sdk">
-			<File
-				RelativePath="..\sdk\amxxmodule.cpp">
-			</File>
-			<File
-				RelativePath="..\sdk\amxxmodule.h">
-			</File>
-			<File
-				RelativePath="..\sdk\moduleconfig.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Config File">
-			<File
-				RelativePath="..\config_parser.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Data Handler">
-			<File
-				RelativePath="..\CString.h">
-			</File>
-			<File
-				RelativePath="..\DataHandler.cpp">
-			</File>
-			<File
-				RelativePath="..\DataHandler.h">
-			</File>
-			<File
-				RelativePath="..\pdata.cpp">
-			</File>
-			<File
-				RelativePath="..\sh_stack.h">
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\amxx_api.cpp">
-		</File>
-		<File
-			RelativePath="..\ham_const.h">
-		</File>
-		<File
-			RelativePath="..\ham_utils.h">
-		</File>
-		<File
-			RelativePath="..\NEW_Util.h">
-		</File>
-		<File
-			RelativePath="..\offsets.h">
-		</File>
-		<File
-			RelativePath="..\srvcmd.cpp">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/dlls/hamsandwich/msvc8/hamsandwich.vcproj
+++ b/dlls/hamsandwich/msvc8/hamsandwich.vcproj
@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\hlsdk\dlls;..\..\..\..\hlsdk\common;..\..\..\..\hlsdk\engine\;..\..\..\..\hlsdk\pm_shared; ..\..\..\metamod\metamod"
+				AdditionalIncludeDirectories="..\;..\sdk;&quot;$(METAMOD)&quot;;&quot;$(HLSDK)\common&quot;;&quot;$(HLSDK)\engine&quot;;&quot;$(HLSDK)\dlls&quot;;&quot;$(HLSDK)\pm_shared&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\hlsdk\dlls;..\..\..\..\hlsdk\common;..\..\..\..\hlsdk\engine\;..\..\..\..\hlsdk\pm_shared; ..\..\..\metamod\metamod"
+				AdditionalIncludeDirectories="..\;..\sdk;&quot;$(METAMOD)&quot;;&quot;$(HLSDK)\common&quot;;&quot;$(HLSDK)\engine&quot;;&quot;$(HLSDK)\dlls&quot;;&quot;$(HLSDK)\pm_shared&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
@ -237,20 +237,40 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="sdk"
+			Name="Module SDK"
 			>
-			<File
-				RelativePath="..\sdk\amxxmodule.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\sdk\amxxmodule.h"
-				>
-			</File>
 			<File
 				RelativePath="..\sdk\moduleconfig.h"
 				>
 			</File>
+			<Filter
+				Name="SDK Base"
+				>
+				<File
+					RelativePath="..\sdk\amxxmodule.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\sdk\amxxmodule.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="AMXX STL"
+				>
+				<File
+					RelativePath="..\sdk\CString.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sdk\CVector.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sdk\sh_stack.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Config File"
@ -263,10 +283,6 @@
 		<Filter
 			Name="Data Handler"
 			>
-			<File
-				RelativePath="..\CString.h"
-				>
-			</File>
 			<File
 				RelativePath="..\DataHandler.cpp"
 				>
@ -279,35 +295,53 @@
 				RelativePath="..\pdata.cpp"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="Pawn Includes"
+			>
 			<File
-				RelativePath="..\sh_stack.h"
+				RelativePath="..\..\..\plugins\include\ham_const.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\plugins\include\hamsandwich.inc"
 				>
 			</File>
 		</Filter>
-		<File
-			RelativePath="..\amxx_api.cpp"
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			>
-		</File>
-		<File
-			RelativePath="..\ham_const.h"
+			<File
+				RelativePath="..\ham_const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ham_utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\NEW_Util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\offsets.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			>
-		</File>
-		<File
-			RelativePath="..\ham_utils.h"
-			>
-		</File>
-		<File
-			RelativePath="..\NEW_Util.h"
-			>
-		</File>
-		<File
-			RelativePath="..\offsets.h"
-			>
-		</File>
-		<File
-			RelativePath="..\srvcmd.cpp"
-			>
-		</File>
+			<File
+				RelativePath="..\amxx_api.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\srvcmd.cpp"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
--- a/dlls/hamsandwich/pdata.cpp
+++ b/dlls/hamsandwich/pdata.cpp
@ -26,7 +26,7 @@
 *  you do not wish to do so, delete this exception statement from your
 *  version.
 */
-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"
 #include "offsets.h"
 #include "NEW_Util.h"
 #include "ham_utils.h"
--- a/dlls/hamsandwich/sdk/CString.h
+++ b/dlls/hamsandwich/sdk/CString.h
--- a/dlls/hamsandwich/sdk/CVector.h
+++ b/dlls/hamsandwich/sdk/CVector.h
--- a/dlls/hamsandwich/sdk/sh_stack.h
+++ b/dlls/hamsandwich/sdk/sh_stack.h
--- a/dlls/hamsandwich/srvcmd.cpp
+++ b/dlls/hamsandwich/srvcmd.cpp
@ -27,7 +27,7 @@
 *  version.
 */

-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"

 #include <stdarg.h>

--- a/dlls/hamsandwich/typetocell.h
+++ b/dlls/hamsandwich/typetocell.h
@ -30,7 +30,7 @@
 #define TYPETOCELL_H

 #include <extdll.h>
-#include "sdk/amxxmodule.h"
+#include "amxxmodule.h"

 #include "CVector.h"