added hamsammich support to build tool
added /useenv support to buildtool for win32
This commit is contained in:
parent
a8652dd91b
commit
2e3c652996
Binary file not shown.
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -66,7 +66,7 @@ public override string BuildModule(Module module)
|
|||
string args = m_Cfg.MakeOpts();
|
||||
if (args != null)
|
||||
{
|
||||
info.Arguments = args;
|
||||
info.Arguments = args + " ";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -75,7 +75,7 @@ public override string BuildModule(Module module)
|
|||
|
||||
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);
|
||||
|
|
Loading…
Reference in New Issue
Block a user