Commit 696b3df

Nick committed on
No longer leave stray files laying around
commit 696b3df23a2534b69de311c80e257d8eb9bc5693 parent da9d27a
1 changed files +27−28
Modifiedcodegen.pas +27−28
@@ -521,28 +521,30 @@ begin
521 goto AssemblyError; 521 goto AssemblyError;
522 end; 522 end;
523 523
524 // Link 524 if Mode in [emNormal, emPreview, emGBS] then begin
525 if Mode = emGBS then 525 // Link
526 begin 526 if Mode = emGBS then
527 if Link(Filename + '.gbs', [Filename + '_driver.obj', Filename + 527 begin
528 '_song.obj', Filename + '_gbs.obj']) <> 0 then 528 if Link(Filename + '.gbs', [Filename + '_driver.obj', Filename +
529 goto AssemblyError; 529 '_song.obj', Filename + '_gbs.obj']) <> 0 then
530 end 530 goto AssemblyError;
531 else 531 end
532 begin 532 else
533 if Link(Filename + '.gb', [Filename + '_driver.obj', Filename + 533 begin
534 '_song.obj', Filename + '_player.obj'], Filename + '.map', Filename + 534 if Link(Filename + '.gb', [Filename + '_driver.obj', Filename +
535 '.sym') <> 0 then 535 '_song.obj', Filename + '_player.obj'], Filename + '.map', Filename +
536 goto AssemblyError; 536 '.sym') <> 0 then
537 end; 537 goto AssemblyError;
538 end;
538 539
539 // Fix 540 // Fix
540 if Mode = emGBS then 541 if Mode = emGBS then
541 RectifyGBSFile(Filename + '.gbs') 542 RectifyGBSFile(Filename + '.gbs')
542 else 543 else
543 begin 544 begin
544 if (Fix(Filename + '.gb') <> 0) then 545 if (Fix(Filename + '.gb') <> 0) then
545 goto AssemblyError; 546 goto AssemblyError;
547 end;
546 end; 548 end;
547 549
548 // Move to destination 550 // Move to destination
@@ -574,21 +576,18 @@ begin
574 goto Cleanup; 576 goto Cleanup;
575 end; 577 end;
576 {$ifdef DEVELOPMENT} 578 {$ifdef DEVELOPMENT}
577 RenameFile(Filename + '_driver.obj', FilePath + '_driver.obj');
578 RenameFile(Filename + '_song.obj', FilePath + '_driver.obj');
579 RenameFile(Filename + '_player.obj', FilePath + '_driver.obj');
580 RenameFile(Filename + '_gbs.obj', FilePath + '_gbs.obj');
581 RenameFile(Filename + '.sym', FilePath + '.sym'); 579 RenameFile(Filename + '.sym', FilePath + '.sym');
582 RenameFile(Filename + '.map', FilePath + '.map'); 580 RenameFile(Filename + '.map', FilePath + '.map');
583 {$endif} 581 {$endif}
584 {$ifdef PRODUCTION} 582 {$ifdef PRODUCTION}
583 DeleteFile(Filename + '.sym');
584 DeleteFile(Filename + '.map');
585 {$endif}
586
585 DeleteFile(Filename + '_driver.obj'); 587 DeleteFile(Filename + '_driver.obj');
586 DeleteFile(Filename + '_song.obj'); 588 DeleteFile(Filename + '_song.obj');
587 DeleteFile(Filename + '_player.obj'); 589 DeleteFile(Filename + '_player.obj');
588 DeleteFile(Filename + '_gbs.obj'); 590 DeleteFile(Filename + '_gbs.obj');
589 DeleteFile(Filename + '.sym');
590 DeleteFile(Filename + '.map');
591 {$endif}
592 end; 591 end;
593 592
594 Result := True; 593 Result := True;