Massive reorganization attempt - part 1.75

dlls/cstrike/cstrike/Makefile

@@ -1,8 +1,8 @@
 #(C)2004-2005 AMX Mod X Development Team
 # Makefile written by David "BAILOPAN" Anderson
 
-HLSDK = ../../../hlsdk
+HLSDK = ../../../../hlsdk
-MM_ROOT = ../../metamod/metamod
+MM_ROOT = ../../../metamod/metamod
 
 ### EDIT BELOW FOR OTHER PROJECTS ###
 

dlls/csx/msvc/csx.sln

@@ -1,29 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csx", "csx.vcproj", "{1DC4A99A-F23F-4AAE-881C-79D157C91155}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinCSX", "..\WinCSX\WinCSX.vcproj", "{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug.ActiveCfg = Debug|Win32
-		{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug.Build.0 = Debug|Win32
-		{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release.ActiveCfg = Release|Win32
-		{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release.Build.0 = Release|Win32
-		{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Debug.ActiveCfg = Debug|Win32
-		{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Debug.Build.0 = Debug|Win32
-		{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Release.ActiveCfg = Release|Win32
-		{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal

dlls/csx/msvc/csx.vcproj

@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="csx"
-	ProjectGUID="{1DC4A99A-F23F-4AAE-881C-79D157C91155}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;csx_EXPORTS;JIT"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				StructMemberAlignment="0"
-				EnableFunctionLevelLinking="FALSE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/csx.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="Release/csx_amxx.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/csx_amxx.pdb"
-				ImportLibrary=".\Release/csx_amxx.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/csx.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;csx_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/csx.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="Debug/csx_amxx.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/csx_amxx.pdb"
-				ImportLibrary=".\Debug/csx_amxx.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/csx.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\CMisc.cpp">
-			</File>
-			<File
-				RelativePath="..\CRank.cpp">
-			</File>
-			<File
-				RelativePath="..\meta_api.cpp">
-			</File>
-			<File
-				RelativePath="..\rank.cpp">
-			</File>
-			<File
-				RelativePath="..\usermsg.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\CMisc.h">
-			</File>
-			<File
-				RelativePath="..\CRank.h">
-			</File>
-			<File
-				RelativePath="..\rank.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="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\csstats.inc">
-			</File>
-			<File
-				RelativePath="..\..\..\plugins\include\csx.inc">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

dlls/sven/msvc7/svencoop.vcproj

@@ -35,7 +35,7 @@
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -171,9 +171,6 @@
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\CString.h">
-			</File>
 			<File
 				RelativePath="..\svencoop.h">
 			</File>
@@ -182,21 +179,28 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Resource Files"
+			Name="Module SDK"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-		<Filter
-			Name="AMXX module"
 			Filter="">
-			<File
-				RelativePath="..\amxxmodule.cpp">
-			</File>
-			<File
-				RelativePath="..\amxxmodule.h">
-			</File>
 			<File
 				RelativePath="..\moduleconfig.h">
 			</File>
+			<Filter
+				Name="SDK Base"
+				Filter="">
+				<File
+					RelativePath="..\amxxmodule.cpp">
+				</File>
+				<File
+					RelativePath="..\amxxmodule.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="AMXX STL"
+				Filter="">
+				<File
+					RelativePath="..\CString.h">
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>

installer/AMXXRelease/ModCstrike.cs

@@ -48,7 +48,10 @@ public override sealed bool CopyExtraFiles(ABuilder ab, string basedir, string s
 		private void AddModules()
 		{
 			Module csx = new Module("csx");
+			csx.sourcedir = "dlls\\cstrike\\csx";
+
 			Module cstrike = new Module("cstrike");
+			cstrike.sourcedir = "dlls\\cstrike\\cstrike";
 
 			m_Modules.Add(csx);
 			m_Modules.Add(cstrike);

installer/AMXXRelease/ModDoD.cs

@@ -29,15 +29,11 @@ private void AddPlugins()
 
 		private void AddModules()
 		{
-			Module dodx = new Module();
+			Module dodx = new Module("dodx");
-			dodx.sourcedir = "dlls\\dod2\\dodx";
+			dodx.sourcedir = "dlls\\dod\\dodx";
-			dodx.projname = "dodx_amxx";
-			dodx.vcproj = "dodx";
 
-			Module dodfun = new Module();
+			Module dodfun = new Module("dodfun");
-			dodfun.sourcedir = "dlls\\dod2\\dodfun";
+			dodfun.sourcedir = "dlls\\dod\\dodfun";
-			dodfun.projname = "dodfun_amxx";
-			dodfun.vcproj = "dodfun";
 
 			m_Modules.Add(dodx);
 			m_Modules.Add(dodfun);

installer/AMXXRelease/ModTs.cs

@@ -27,15 +27,11 @@ private void AddPlugins()
 
 		private void AddModules()
 		{
-			Module tsx = new Module();
+			Module tsx = new Module("tsx");
 			tsx.sourcedir = "dlls\\ts\\tsx";
-			tsx.projname = "tsx_amxx";
-			tsx.vcproj = "tsx";
 
-			Module tsfun = new Module();
+			Module tsfun = new Module("tsfun");
 			tsfun.sourcedir = "dlls\\ts\\tsfun";
-			tsfun.projname = "tsfun_amxx";
-			tsfun.vcproj = "tsfun";
 
 			m_Modules.Add(tsx);
 			m_Modules.Add(tsfun);