Massive reorganization attempt - part 1

Oh dear, what has DS done now?

installer/AMXXRelease/AMod.cs

@@ -34,6 +34,7 @@ namespace AMXXRelease
 		{
 			build = "Release";
 			outdir = "modules";
+			bindir = "msvc7";
 		}
 		
 		public Module(string name)
@@ -41,6 +42,7 @@ namespace AMXXRelease
 			build = "Release";
 			outdir = "modules";
 			sourcedir = "dlls\\" + name;
+			bindir = "msvc7";
 			projname = name + "_amxx";
 			vcproj = name;
 		}

installer/AMXXRelease/CoreMod.cs

@@ -129,34 +129,16 @@ namespace AMXXRelease
 		{
 			Module core = new Module();
 
-			core.bindir = "msvc";
 			core.sourcedir = "amxmodx";
 			core.vcproj = "amxmodx_mm";
 			core.build = "JITRelease";
 			core.projname = "amxmodx_mm";
 			core.outdir = "dlls";
 
-			Module mysqlx = new Module();
-			mysqlx.projname = "mysql_amxx";
-			mysqlx.sourcedir = "dlls\\" + "mysqlx";
-			mysqlx.vcproj = "mysql2";
-
-			Module sqlitex = new Module();
-			sqlitex.projname = "sqlite_amxx";
-			sqlitex.sourcedir = "dlls\\" + "sqlite";
-			sqlitex.bindir = "msvc7";
-			sqlitex.vcproj = "sqlite_amxx";
-
-			Module engine = new Module();
-			engine.sourcedir = "dlls\\engine";
-			engine.projname = "engine_amxx";
-			engine.vcproj = "engine";
-
-			Module fun = new Module();
-			fun.sourcedir = "dlls\\fun";
-			fun.projname = "fun_amxx";
-			fun.vcproj = "fun";
-
+			Module mysqlx = new Module("mysqlx");
+			Module sqlitex = new Module("sqlite");
+			Module engine = new Module("engine");
+			Module fun = new Module("fun");
 			Module geoip = new Module("geoip");
 			Module fakemeta = new Module("fakemeta");
 			Module sockets = new Module("sockets");

installer/AMXXRelease/ModCstrike.cs

@@ -37,7 +37,7 @@ namespace AMXXRelease
 			if ((int)System.Environment.OSVersion.Platform == 128)
 			{
 			} else {
-				File.Copy(source + "\\dlls\\csx\\source\\WinCSX\\Release\\WinCSX.exe",
+				File.Copy(source + "\\dlls\\csx\\WinCSX\\Release\\WinCSX.exe",
 					  basedir + "\\data\\WinCSX.exe",
 					  true);
 			}
@@ -47,16 +47,8 @@ namespace AMXXRelease
 
 		private void AddModules()
 		{
-			Module csx = new Module();
-			csx.sourcedir = "dlls\\csx\\source";
-			csx.projname = "csx_amxx";
-			csx.bindir = "msvc";
-			csx.vcproj = "csx";
-
-			Module cstrike = new Module();
-			cstrike.sourcedir = "dlls\\cstrike";
-			cstrike.projname = "cstrike_amxx";
-			cstrike.vcproj = "cstrike";
+			Module csx = new Module("csx");
+			Module cstrike = new Module("cstrike");
 
 			m_Modules.Add(csx);
 			m_Modules.Add(cstrike);

installer/AMXXRelease/ModDoD.cs

@@ -32,13 +32,11 @@ namespace AMXXRelease
 			Module dodx = new Module();
 			dodx.sourcedir = "dlls\\dod2\\dodx";
 			dodx.projname = "dodx_amxx";
-			dodx.bindir = "msvc";
 			dodx.vcproj = "dodx";
 
 			Module dodfun = new Module();
 			dodfun.sourcedir = "dlls\\dod2\\dodfun";
 			dodfun.projname = "dodfun_amxx";
-			dodfun.bindir = "msvc";
 			dodfun.vcproj = "dodfun";
 
 			m_Modules.Add(dodx);

installer/AMXXRelease/ModNs.cs

@@ -28,11 +28,7 @@ namespace AMXXRelease
 
 		private void AddModules()
 		{
-			Module ns = new Module();
-
-			ns.sourcedir = "dlls\\ns\\ns";
-			ns.projname = "ns_amxx";
-			ns.vcproj = "ns";
+			Module ns = new Module("ns");
 
 			m_Modules.Add(ns);
 		}

installer/AMXXRelease/ModTFC.cs

@@ -28,12 +28,7 @@ namespace AMXXRelease
 
 		private void AddModules()
 		{
-			Module tfcx = new Module();
-
-			tfcx.sourcedir = "dlls\\tfc\\tfcx";
-			tfcx.vcproj = "tfcx";
-			tfcx.projname = "tfcx_amxx";
-			tfcx.bindir = "msvc";
+			Module tfcx = new Module("tfcx");
 
 			m_Modules.Add(tfcx);
 		}

installer/AMXXRelease/ModTs.cs

@@ -30,8 +30,7 @@ namespace AMXXRelease
 			Module tsx = new Module();
 			tsx.sourcedir = "dlls\\ts\\tsx";
 			tsx.projname = "tsx_amxx";
-			tsx.bindir = "msvc";
-			tsx.vcproj = "tsx_amxx";
+			tsx.vcproj = "tsx";
 
 			Module tsfun = new Module();
 			tsfun.sourcedir = "dlls\\ts\\tsfun";