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 cf41e6a9..67d15add 100755 Binary files a/installer/AMXXRelease/AMXXRelease.exe and b/installer/AMXXRelease/AMXXRelease.exe differ 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