From 2e3c65299690cdc9b0dba52e5d893d92648f2170 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Fri, 3 Aug 2007 16:48:04 +0000
Subject: [PATCH] added hamsammich support to build tool added /useenv support
 to buildtool for win32

---
 installer/AMXXRelease/AMXXRelease.exe | Bin 32768 -> 32768 bytes
 installer/AMXXRelease/CoreMod.cs      |   2 ++
 installer/AMXXRelease/LinuxBuilder.cs |  12 ++----------
 installer/AMXXRelease/Win32Builder.cs |   6 +++---
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/installer/AMXXRelease/AMXXRelease.exe b/installer/AMXXRelease/AMXXRelease.exe
index c3ab2b08e0c727c4eb4dba423abdf811f6e0b2d5..f12bb26361543f8a9620b7a22a9b675ce6e5f7ef 100755
GIT binary patch
delta 2035
zcmZ`)Yiv_>6hHsl_O|PDUAJy!y4|*0*WEto9<T`nH^7xS9uwGR5Zu6Ga1lywKk#8$
z)@sz@BTx<+mPj0mCPWiAi#mgdsGu|BgIN%aK`<g8d?E3J36aEe@9iC{hMV-<^E>Bv
z9{+RxcT1<abecOb$~m`WpRZ!ev&Z}F*ZKkafSxo!tSIYsp_lcuRk;isu?xb0>;YI!
zKaPG=%K*ZD07m+K06gAgv0QiYl$~wDqUtHD^pX+wq+H~2nej~ZsDm4_0_dIQqz}Lx
z5OIy*5#A(D&`vn$AmXr_2qNWk#SHKVy&aepz4(?;$<E?uf=KdrK`5K1pk$bWoCbX|
zqP(Rm=<@~~ymW(nI_Wk^Q?LX-70d95*Me8X#dz84W=;%;DkzK1SBrxoi?z}Od#Ii(
zriWqN;ft^cqHmMFoy-{Vdr<H1Vr#M6FS5OO)c<J7Gvr9pnayQQT&ZZHP;}IU*~_@B
zrh~nUPuFC)n<nII{f=}I9gNOoc8k1ps|Z_b!_101NLJv%S|2-v@7H!eRBg%E=U@{Z
zw+O(=NejuCtfp}UIBDfPy?>s*YfhI&NKHA3Zsw)^*c(`68zYM{RK0ZDf`<e5hN`Xk
zRS>6+^kJR`Ey>lD1zC(zr)H&9Ex=oWh2<%-D6`>|m8-oCS#h$;{rLR0o+F;t?rWMZ
z_d?l+4e~-=F%IH%yiz)zG)WYtC{a$5uC{Vfvr;QRYgVO|Z|g#CgKe%A8|9H7PO@Qn
za0xAJL$I~Ei3nN`o%8hmIbFR~9C#?UOztCsp9JG9iG01V`fkUe3p<x~ua@e6N1IEz
z4|mtcqe#U3+~^C*?{t2qf@*kweff&JjOsXL(nd8&x;m<9%}S%Xpjnks^@^3;O&g}f
zcC*JWe+GV%==4?NWpUkq?!KF)FcbRP=HiQ_v)V_9>%uX<HrYhi7Jm$t*0oUl>rTEx
zH)NtclIBskq%6=4nN?Gz)P<Ab7d%_&EB5zngmD3&n9l8w_jInJ_e8EI@_=C^5hESW
z!RKIy8aR|k53)8w2O3mggirt~8dcQB)<6)#dDP502u)FI0MAxzXLhKE83kownQkAU
ze^ei|>q<a`(Po*Mfll3i2*Hyhi|z!5AYFjQ6?7fGr-C6kp`Z-7baq0ei{-fMaD(*`
z>Q+z&s>m0GV+vB6iNY6orko`Tm-0+GOBBK_BXSxoFx?^}E$~$ZspX?Ep&+$<6lMyT
zzZEc{Rn4iEcsP&L*3t^nDvY;+Twg13q9D*jf4lFr7E_QG*sUNfE|F)d1>Y%%gC%kn
zb-huD<&nJJD2x)Slb!N@V^F+QrONwlgql2(_uB}^a;KWNawB8x3>@a|@DUv2*N}XV
zM>qrL`48D7TqVmi$QR%n@EB*=chG3O#G<eibX*i3gC!(gaGNZZifmG(MUg8NZx?hC
zXQN_y1U7Sm@g)0-eE_H72lxeeX2!7==RM<Wf_==+v&-xn`<4C4^l9~9-K_cQhTORp
zox@$e6Sl!FNRiwP3D^ryQ2CwsWyfZ0k5^$TKA8I{e$h}oc=Qdobn3#2BZH^6-a0j!
z$jz)xGed>ZQc{fT*Z*B&9gqj2KG6Ys3t6w569%&0(%e(sFFFo#13CM^az=$`>7!#n
p4fJk%g&7-YVhyl3_t*BxIe>2`+V40LWfrb2mUHg8;mF2}{{qH1mRbM+

delta 2003
zcmZ`)e{2(V6o2p9Ue|8B(VgqoZLaOQZe6z>WgBd6M7IDd1B5MrY$0<4QBWY8hlz=R
zZ4)F@gHT`mEkuw+2!S{&h+sm91f$3w%Z!33nFcUu5Q!$t9}(Z(_4Xr?@6vbg^WNwE
z_`dJ=cJa6nj|;m7g{QldFO=Y(<iQov{62uCz$*?AaU}gR`LP%GrxF;Gd~tSaYd-%3
z{*BEB=m-EH>-PbObPFS?j%mjwY$AvEIGy(n3Spo-m4&#2p7j+9UZgjD58z??))!`J
z^ZW9K>@d(@4d8Uyto=3mQ~ivZ{N)y5Gg7iZ4k{i|{f1c<^(xDZP%e}Dr?aTaHyySN
zdcq&1UH*mWq3`?!ocl&Nm@PmVcc!g$E?E)PKn4ti)do$<5i7h)GfHc)oq9``VGn&+
zx)vX&;y_p;CWIueBHPlzq9VC$>RyTl9?pD^z5Tp%XI>rcsV<~11Nrz7T?w?|FjbW$
z1ld7H$^tq29GoPFY3{J77CULQtQr-{4p#Gknu4WxjCz6{ovoSN3xFIEU>W!70B{Lv
zCmZ{{Jk)YQeRPtZn56F<*VVnOZgMf*DXK&CZ*XSzNw(-4u&UlHYAL@r(3-^@+2FLZ
zzEuRUs#<m3nrT<pQ@p%0{}uM7`_WF?=x28p4VAciC%1Btd1i~JO<k+c8MoRvHxF2V
zD5toGx1^3R#Vr3l>qhxMO)HnTXH%lQg0@uz-4)s6J!EqNZ3*ghI#tnxOX#nPM$d94
zn8nvm(i5~WRLGpiLQzc8k&ti3-CEvlw#*ZL!_1(M?@q{#hsa$SjUAn6gYWwIC?-nZ
zE&0jG3IBf{=a^#7V}x~M9>17Yp2uy}1`;G8oG-`{6@^=!&64&a%wtKn!d`kVym-=$
zZ^o5WS@ng*Av#{Jj?@+H;0uAW=n~y(H%IJqiTRez8GJCT6{v^#ZDPe^+3Yk-h3ZCn
zvie0&oUeUg`BFIJ1DM9U4n&u?&*kS=sl1wbw%DQw>u?r61&QCUEorm>TNoXfVfbno
zl|!V~KrOfkLeQ5+_1MN}TD|7mUa%S^sDv^dC1JMZc}B|&AGBI>Aq=BBN<h11Cse_i
z*vyH*D!4EOjp^tbT;hUNkTpwVCP21Gj5g@#8r;Mcj1HuICG1n+9~~LZC{Wy>#Ti)?
zi0H`3qQJI>n32>7yr4VHz(1x0W;7a1t-JzdIx?Aab!3+4n!<cPjnWmS#EmtAR^JTF
z;{Uql4i)H2BO`E7M`pnTIx^!vnG$DhGO`$PT{<$3SAoGa(vDYwQAQQo*=y$;fpyJV
z;91blw-&afk#@eda3!_1zDJ0?hNt0mQG$<Qzqp9y2O_~~I4>T>AsA)L=b&AHVer_8
z@gmgPzeWX`0R;sffku`x{LPjkUDoL`Q<rme??Py2&Qjg761oJR{Un~nV{i&C!_Oe1
zle!yR#e47wp1^Z>34g@v_$ylD#wTmUNu8<f4VE0*+tyX$?S)ma5!S#gsOPOd#YpAn
zT6hLZ!AG~-e7W*e$|mTiyyyn2jU!UA=tUcUnNEa%`r$3lZwu)9oL!4A=U+{&doYd`
zx7|rM7T@MC!9X8REWKW$TT6<BcwZ{F<L#W3)OSDk+d0B7BLX+}(5hF_9)U*wt4sa9
bdT1Qbp*5`&jx~9i!aI?aYv5*1GGhM^yyu&<

diff --git a/installer/AMXXRelease/CoreMod.cs b/installer/AMXXRelease/CoreMod.cs
index 64b3f85f..263f5425 100755
--- a/installer/AMXXRelease/CoreMod.cs
+++ b/installer/AMXXRelease/CoreMod.cs
@@ -146,6 +146,7 @@ private void AddModules()
 			Module sockets = new Module("sockets");
 			Module regex = new Module("regex");
 			Module nvault = new Module("nvault");
+			Module sammich = new Module("hamsandwich");
 
 			m_Modules.Add(core);
 			m_Modules.Add(mysqlx);
@@ -157,6 +158,7 @@ private void AddModules()
 			m_Modules.Add(regex);
 			m_Modules.Add(nvault);
 			m_Modules.Add(sqlitex);
+			m_Modules.Add(sammich);
 		}
 	}
 }
diff --git a/installer/AMXXRelease/LinuxBuilder.cs b/installer/AMXXRelease/LinuxBuilder.cs
index 6a9d5778..afece6a7 100755
--- a/installer/AMXXRelease/LinuxBuilder.cs
+++ b/installer/AMXXRelease/LinuxBuilder.cs
@@ -39,10 +39,7 @@ public override void CompressDir(string target, string dir)
 			
 
 
-			if (m_Cfg.MakeOpts().IndexOf("amd64") != -1)
-				info.Arguments = "zcvf \"" + target + "_amd64.tar.gz\" " + file_list;
-			else
-				info.Arguments = "zcvf \"" + target + ".tar.gz\" " + file_list;
+			info.Arguments = "zcvf \"" + target + ".tar.gz\" " + file_list;
 			info.UseShellExecute = false;
 
 			Process p = Process.Start(info);
@@ -66,10 +63,7 @@ public override void AmxxPc(string inpath, string args)
 
 		public override string GetLibExt()
 		{
-			if (m_Cfg.MakeOpts().IndexOf("amd64") != -1)
-				return "_amd64.so";
-			else
-				return "_i386.so";
+			return "_i386.so";
 		}
 
 		public override string BuildModule(Module module)
@@ -110,8 +104,6 @@ public override string BuildModule(Module module)
 			//Now we need to see if the DL handle is valid!
 			string dlsym_dir = m_Cfg.GetSourceTree() + "\\plugins";
 			string dlsym = dlsym_dir + "\\dlsym";
-			if (m_Cfg.MakeOpts().IndexOf("amd64") != -1)
-				dlsym += "64";
 			dlsym = PropSlashes(dlsym);
 			dlsym_dir = PropSlashes(dlsym_dir);
 			info.WorkingDirectory = dlsym_dir;
diff --git a/installer/AMXXRelease/Win32Builder.cs b/installer/AMXXRelease/Win32Builder.cs
index ea637453..7025085a 100755
--- a/installer/AMXXRelease/Win32Builder.cs
+++ b/installer/AMXXRelease/Win32Builder.cs
@@ -66,16 +66,16 @@ public override string BuildModule(Module module)
 			string args = m_Cfg.MakeOpts();
 			if (args != null)
 			{
-				info.Arguments = args;
+				info.Arguments = args + " ";
 			} 
 			else 
 			{
 				info.Arguments = "";
 			}
-			
+
 			info.WorkingDirectory = PropSlashes(dir);
 			info.FileName = m_Cfg.DevenvPath();
-			info.Arguments = "/rebuild " + module.build + " " + module.vcproj + ".vcproj";
+			info.Arguments += "/rebuild " + module.build + " " + module.vcproj + ".vcproj";
 			info.UseShellExecute = false;
 
 			Process p = Process.Start(info);