Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions tools/hxcpp/Linker.hx
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,9 @@ class Linker

args = args.concat(libs);

var lib_name = mLibDir!="" ? mLibDir+"/"+file_name : out_name;
var result = ProcessManager.runCommand("", mExe, args, true, true, false,
"\x1b[1mLink: \x1b[0m" + out_name);
"\x1b[1mLink: \x1b[0m" + lib_name);
if (result!=0)
{
Tools.exit(result);
Expand All @@ -301,8 +302,8 @@ class Linker

if (mRanLib!="")
{
args = [out_name];
var result = ProcessManager.runCommand("", mRanLib, args, true, true, false, "\x1b[1mRanlib:\x1b[0m " + out_name);
args = [lib_name];
var result = ProcessManager.runCommand("", mRanLib, args, true, true, false, "\x1b[1mRanlib:\x1b[0m " + lib_name);
if (result!=0)
{
Tools.exit(result);
Expand All @@ -312,6 +313,7 @@ class Linker

if (mLibDir!="")
{
Log.info("\x1b[1mMove file: \x1b[0m" + mLibDir+"/"+file_name + " to " + out_name);
sys.io.File.copy( mLibDir+"/"+file_name, out_name );
FileSystem.deleteFile( mLibDir+"/"+file_name );
}
Expand Down
Loading