Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added hamsammich support to build tool

Browse Source 
added /useenv support to buildtool for win32
This commit is contained in:
David Anderson 2007-08-03 16:48:04 +00:00
parent a8652dd91b
commit 2e3c652996
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
installer/AMXXRelease/AMXXRelease.exe
View File

Binary file not shown.

2
installer/AMXXRelease/CoreMod.cs
View File

@ -146,6 +146,7 @@ private void AddModules()
Module sockets = new Module("sockets"); Module sockets = new Module("sockets");
Module regex = new Module("regex"); Module regex = new Module("regex");
Module nvault = new Module("nvault"); Module nvault = new Module("nvault");
Module sammich = new Module("hamsandwich");
m_Modules.Add(core); m_Modules.Add(core);
m_Modules.Add(mysqlx); m_Modules.Add(mysqlx);
@ -157,6 +158,7 @@ private void AddModules()
m_Modules.Add(regex); m_Modules.Add(regex);
m_Modules.Add(nvault); m_Modules.Add(nvault);
m_Modules.Add(sqlitex); m_Modules.Add(sqlitex);
m_Modules.Add(sammich);
} }
} }
} }

12
installer/AMXXRelease/LinuxBuilder.cs
View File

@ -39,10 +39,7 @@ public override void CompressDir(string target, string dir)
if (m_Cfg.MakeOpts().IndexOf("amd64") != -1) info.Arguments = "zcvf \"" + target + ".tar.gz\" " + file_list;
info.Arguments = "zcvf \"" + target + "_amd64.tar.gz\" " + file_list;
else
info.Arguments = "zcvf \"" + target + ".tar.gz\" " + file_list;
info.UseShellExecute = false; info.UseShellExecute = false;
Process p = Process.Start(info); Process p = Process.Start(info);
@ -66,10 +63,7 @@ public override void AmxxPc(string inpath, string args)
public override string GetLibExt() public override string GetLibExt()
{ {
if (m_Cfg.MakeOpts().IndexOf("amd64") != -1) return "_i386.so";
return "_amd64.so";
else
return "_i386.so";
} }
public override string BuildModule(Module module) 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! //Now we need to see if the DL handle is valid!
string dlsym_dir = m_Cfg.GetSourceTree() + "\\plugins"; string dlsym_dir = m_Cfg.GetSourceTree() + "\\plugins";
string dlsym = dlsym_dir + "\\dlsym"; string dlsym = dlsym_dir + "\\dlsym";
if (m_Cfg.MakeOpts().IndexOf("amd64") != -1)
dlsym += "64";
dlsym = PropSlashes(dlsym); dlsym = PropSlashes(dlsym);
dlsym_dir = PropSlashes(dlsym_dir); dlsym_dir = PropSlashes(dlsym_dir);
info.WorkingDirectory = dlsym_dir; info.WorkingDirectory = dlsym_dir;

4
installer/AMXXRelease/Win32Builder.cs
View File

@ -66,7 +66,7 @@ public override string BuildModule(Module module)
string args = m_Cfg.MakeOpts(); string args = m_Cfg.MakeOpts();
if (args != null) if (args != null)
{ {
info.Arguments = args; info.Arguments = args + " ";
} }
else else
{ {
@ -75,7 +75,7 @@ public override string BuildModule(Module module)
info.WorkingDirectory = PropSlashes(dir); info.WorkingDirectory = PropSlashes(dir);
info.FileName = m_Cfg.DevenvPath(); info.FileName = m_Cfg.DevenvPath();
info.Arguments = "/rebuild " + module.build + " " + module.vcproj + ".vcproj"; info.Arguments += "/rebuild " + module.build + " " + module.vcproj + ".vcproj";
info.UseShellExecute = false; info.UseShellExecute = false;
Process p = Process.Start(info); Process p = Process.Start(info);