From 4652b5956622106a9558d381679cd7aa28d5cb98 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Sun, 20 Nov 2016 20:13:56 +0100
Subject: [PATCH] continue e979a68154031f785550f9dd16d29794020013cb

---
 src/ce_ceproject.pas | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/ce_ceproject.pas b/src/ce_ceproject.pas
index f3af3719..030f3eb6 100644
--- a/src/ce_ceproject.pas
+++ b/src/ce_ceproject.pas
@@ -643,6 +643,7 @@ end;
 procedure TCENativeProject.updateOutFilename;
 var
   fe: boolean = false;
+  ext: string;
 begin
   fOutputFilename := currentConfiguration.pathsOptions.outputFilename;
   fe := currentConfiguration.pathsOptions.forceExtension;
@@ -680,11 +681,15 @@ begin
     fe := true;
   end;
   //
-  if fe then case currentConfiguration.outputOptions.binaryKind of
-    executable: fOutputFilename := ChangeFileExt(fOutputFilename, exeExt);
-    staticlib:  fOutputFilename := ChangeFileExt(fOutputFilename, libExt);
-    sharedlib:  fOutputFilename := ChangeFileExt(fOutputFilename, dynExt);
-    obj:        fOutputFilename := ChangeFileExt(fOutputFilename, objExt);
+  if fe then
+  begin
+    ext := fOutputFilename.extractFileExt;
+    case currentConfiguration.outputOptions.binaryKind of
+      executable: if ext <> exeExt then fOutputFilename += exeExt;
+      staticlib:  if ext <> libExt then fOutputFilename += libExt;
+      sharedlib:  if ext <> dynExt then fOutputFilename += dynExt;
+      obj:        if ext <> dynExt then fOutputFilename += objExt;
+    end;
   end;
   //
   fCanBeRun := false;