From ed5395a54a9788629299780dd148b359fd66a629 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Sun, 3 Sep 2006 03:48:54 +0000 Subject: [PATCH] AMD64 building fixes and such --- amxmodx/debugger.cpp | 2 +- installer/AMXXRelease/AMXXRelease.exe | Bin 32768 -> 32768 bytes installer/AMXXRelease/Build.cs | 29 ++++++++++++++++---------- installer/AMXXRelease/Main.cs | 2 +- installer/AMXXRelease/linux64.info | 2 +- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/amxmodx/debugger.cpp b/amxmodx/debugger.cpp index c7c275b5..e821fa4b 100755 --- a/amxmodx/debugger.cpp +++ b/amxmodx/debugger.cpp @@ -627,7 +627,7 @@ void Debugger::FmtGenericMsg(AMX *amx, int error, char buffer[], size_t maxLengt { _snprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") - %s", error, filename, GenericError(AMX_ERR_EXIT)); } else if (error == AMX_ERR_NATIVE) { - amx_GetNative(amx, (int)amx->usertags[UT_NATIVE], native); + amx_GetNative(amx, reinterpret_cast(amx->usertags[UT_NATIVE]), native); _snprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") (native \"%s\") - debug not enabled!", error, filename, native); } else { _snprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") - debug not enabled!", error, filename); diff --git a/installer/AMXXRelease/AMXXRelease.exe b/installer/AMXXRelease/AMXXRelease.exe index cf41e6a903bb957119e41a7938c533331de1a0fd..67d15add8624633855ab9a6710f96c98d0ba6b61 100755 GIT binary patch delta 3429 zcmZ9P3s98T701v0_PgIcfMu5z7L>;>yTHQ2y0V}KM6f0r6cxuQ#o?_1n; zXE@*gch0%zzQ0`(2_=zGc0FlYzx=-=-zy>eMhTeIqJjw{75f)$i%K6anOYGSk@|~Hnkph%Qm2-Vnv=5qV&pgnTb)I5 zYJ)Bu9eR&vdh>Me=}fOv_r90ub?Dx?7c$*bbobRvuUHH%T7%tJWHpW7nwW6AEFa}p zvYUKj>S|KWS5Iq*N0iC6%`*ioV!4}zOAgw)wGd0xD()H+YoAOErMs6;x+8WITQx~W zQk`tud#78L6usqY>=6-6b;mu$rDTA&7Wugc2!wPJt#9utlV&!|?(mZOZ}c4#(@3HP8$ ztSjpkQbnl@bpG*OLS<5(y^1*ogibW56EmZsOI zX&jg_e1$!oruV1mV`+LUP5%~kzCL$_T}li5hgX!A#myAwZIw&l6cSe$SHmkL-fxt% zgv7l~dGU6lTq3-9A=Mb3cP-1zx`ac-%xt5OqK=t8E~Ka<)3Pm$r_wC!h>&rSXJKcA z7NamSCY$6~+4~|U(yZ)CstJ^50gT(+2|*Y^8}pziOVhy|#e=R@ z)?hhTSb^W+Gh39!8pHl_;^uGopCayLYej@8X3G03Usm?3+)-1`o2uG`=dr4=c)V71 zswn;Zrk~AAd|TknRI}C9T_XR@>XWiw&10m9U$5DX_KtN3=8#qVa_|t^r)pQ@l3uMH zY}t()=G%&c#6#AG8|hoo&%U{7LkvC8hU?+ScZqN13h40w;A<3o3s<(^jn97MetxKK zy0r)imjvqhpX;8@8KcKk4K7h1XfVO!p~vG6@ZtBH10I4Vm;wb5l(Y%Sf)tT7fJDKK z-+>}?yUZ+t7D>YfeNEC23|b)RC4<@}{m`H#l3vxx4$CFJj%a}*J~F+Fs_+)r_?796 zWJj_je1^oo3nlOsemeo2B@Ze+PzqD<-72V8Ngy>y+EKWU*r5#W)d}8GI*`6$(61zI zHt6?~wj1;pNqY>sCh4d_H_0r1!Bu?DgL>4S(Mec09TiKG#jW7-MTP}m@2Fwc|+H83h^2-;1< z5RAi~B3d z=IE(nf9v5s{Gpi|cZBCQ9#cM6`Og}kA)GIq*&N>kJKAPsB(s9@e0s0|Y;n@pybQEm^{X1s1(jK&n=>O2(M}h2w1T7|35SMQ!JWZ>JQ)(w1 zz)U9`r9t%kgofjodV)5QgBZ@k)L+w1^!$;oMEfyaMGnJNx(@ZfFy}bfv<^5S3!Q*j zS{~}V(QbkJwQo3*?~p%0 zz4?6-f@ZjZc0GiZ5V+t=)YGJmNSh_?d>LH~^Dt+H^sItT#bZ86PLrR)Y4`{}1&!E9 z0VyYqq?K$S-zHngbL2-PN!}(OkPGCm5jWdWgl&FD?xvbCzWh{H^?GH}1Xhd8QkMXT)2eB)XG}I(O$L?cH-p*4W1n<*sV6^6IS@`dH-DZx5;p%ITDW`% delta 3356 zcmZ9O3v3hj9mjwF^WFKCIB|>}hmgd^+coVFgnx@*QXiC}mKHQx4`or;PKYU6MAwOG?Le>&)DBG>tYWlUwlcck|9|K7 z983P)_w#$*|8-|)GD0RJ9C*g`;lRH}pQ|8)qbK?t-pv4O06!UksCBg3MXO0a*^wP4 zX@@U{LH1dWUje^M7XkcnE&xH@4j|K8B$|yCPfDaTJKIw!1Yg8}4ZtacDo_Z?DzqsF zfS9bubXyYZWjj6Ot(_$&u#c@q*v+D54d|G6nF%}4JKl9-5&CI&*;b`IYJxc4(T;sh zNk3NE)V&0@7pVKu7PigBnAwsDU?35sH_NK)xvW8UiE0_|mNjny)&gToYC)Ib|ctPD!QMDiOkM(dy6&i*?cdX zB6jHfL%!Rkx&M;yorPXGQHQq=+8189`^`6{F3YFx8ub<}FW*Ee=umlUx>mpuhB3w6 zQep~OaIw`!=Hi34?kU9<4MJ(yq%N9Hj2PX^rrj+LliE8?dXmCx*UohFmh5gtvbu!@ zbGM`S%&8;^x_(Z;xf}f<+-h40CoRkB>-4}JPyD?Z-b;BLk}*|O|C;Z_)v+la(@cK? z&!=pX)LVJkqUxfyih#e}gu}waDA%ZX!nP-Imt>o)GIt73oG7bn=>rv|>Cx#tK|OBJ zV+MWRpsyM9R|ahrbN3U}a)WL%=p_c-r|ES#KtcVXAuw#v)S!Twt8Kn@N0XQPwkwJDKyExm?V=`1pxQJoB>Mtgd1X7Bi~@OtL;^ zbr+MY4^Jzws6WZ2S=5)AOtUs~`g`P28QfO7ru^3CUs+V)sR`oWM(`hczDXK)) z6H&XEX2U@pWSXU_3aTWY7TG1K?Od}1;F8r<(*d)(ep*}9M`^0+Wbu#C^X*AZxoNwv zhrB?a_Jz^D?en>hU_zn+PoYy16AHhoKd0Ay&GN5VBup!-_YyaKvp#|a7pgmSceZ5i z5|T?7+kGYUz|eP`MM|O1QR8fxX}4ln2Le;!jF35q5j%!ob1>?BT61NUp=U ztu(_Z=|gRoF#*Axz;i6uguxXR;A3o8z}jJLHZYfX=qG`n5>NJ#U<(nx7U|)dR|%#4 zb$+_3wu?Dlsg1JBN438yGagstNxVc~4~_AvA(nc%?p@v~`~>k*cm4Bdb2ARoyY+U` zOKlCu(VlMDgzHeGq!vAc+v48?@FiZmaJ&3#cBtPUd^CxJg;tz>0N)S(ht|ONa9;Sr z1pj>xtyqfJZOA{MlS-r2i-ZdRO_W4lC>)ngi8B0I@`DWjrpF>rrHjCizfHxk6&AuQ za6>((K_m-O3#Z*k5_s_Ui)B8^Grh2g(|(=4!|9Mt-JD+3X$7ZaI^ECdO^qDz0LRma z7Vy$DjeWEv+DbCn`=aOY_Y^AND!v;5Cdfu1jx?py7GVg&72|a0S^O}ybsUIndKgziqRzZx@b+}A=pbFwT z*|1F&?9k~m9(z)!yQCjuQG6BvuEQ6k4}2iv69F&`E|UW{BO1}D5-IJ6FB=(7z&T*S zKvbiZqzft5q>+LYgo`?L;SFoS(yYZ=NjK6jTNr8U6oL;pjlw;qy%2&sS_~GON}vuh ztt@jGR+vU0oQC+kZwtflcpe?*q|H7ICpl@e2t&bqR;SG{49htU1DlfqzvHA0MuETS znQRRexT9yXwNM}(Tfo}n3a@a=6;5%|Zm&Q=o0h2+hB)OimvhQxZph30g-+Vgrt<2% zY5d2=W}%I(fs-~v1u{Bmg&%Or-S9?U9Ug7`8?pGkeFZ%P};+aSn2 zm}8eWka6B<92UqWFb+%6?t-=QdDPpu=g0CsI12~mXUSPOEIZKu8rF`(JKXxL z6+M%@Px=CsnSVnrL9=<1M4$t1qkROzLIhlJ6LmSaE!^6TQgkrt$4@Gq`2EIY>#H0+rKCpjhg=t D8H95a diff --git a/installer/AMXXRelease/Build.cs b/installer/AMXXRelease/Build.cs index 6a422631..37514f61 100755 --- a/installer/AMXXRelease/Build.cs +++ b/installer/AMXXRelease/Build.cs @@ -8,26 +8,33 @@ namespace AMXXRelease public class Build { protected ArrayList m_Mods; + protected Config m_Cfg; - public Build() + public Build(Config cfg) { m_Mods = new ArrayList(); + m_Cfg = cfg; CoreMod core = new CoreMod(); ModCstrike cstrike = new ModCstrike(); - ModDoD dod = new ModDoD(); - ModEsf esf = new ModEsf(); - ModNs ns = new ModNs(); - ModTFC tfc = new ModTFC(); - ModTs ts = new ModTs(); m_Mods.Add(core); m_Mods.Add(cstrike); - m_Mods.Add(dod); - m_Mods.Add(esf); - m_Mods.Add(ns); - m_Mods.Add(tfc); - m_Mods.Add(ts); + + if (m_Cfg.MakeOpts().IndexOf("amd64") == -1) + { + ModDoD dod = new ModDoD(); + ModEsf esf = new ModEsf(); + ModNs ns = new ModNs(); + ModTFC tfc = new ModTFC(); + ModTs ts = new ModTs(); + + m_Mods.Add(dod); + m_Mods.Add(esf); + m_Mods.Add(ns); + m_Mods.Add(tfc); + m_Mods.Add(ts); + } } public virtual int GetMods() diff --git a/installer/AMXXRelease/Main.cs b/installer/AMXXRelease/Main.cs index efdb6cef..888b4ba9 100755 --- a/installer/AMXXRelease/Main.cs +++ b/installer/AMXXRelease/Main.cs @@ -52,7 +52,7 @@ public void Release(string file) Releaser.IsWindows = true; } - Build build = new Build(); + Build build = new Build(m_Cfg); builder.Build(m_Cfg, build); } diff --git a/installer/AMXXRelease/linux64.info b/installer/AMXXRelease/linux64.info index 8dca7803..936babc6 100755 --- a/installer/AMXXRelease/linux64.info +++ b/installer/AMXXRelease/linux64.info @@ -3,4 +3,4 @@ source = /home/dvander/code/amxx makeopts = amd64 output = /home/dvander/done devenv = /usr/bin/make -release = amxmodx-1.75 +release = amxmodx-1.76