From 8b6ae1945af6e43cce9366761ed3aed03215749f Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Fri, 19 Jan 2018 11:25:04 +0100
Subject: [PATCH] Resolving bug on path of simulation code compilation from
diplodocus models when using projects
---
doc/config_linux.xml | 2 +-
doc/config_macosx.xml | 2 +-
doc/config_windows.xml | 2 +-
src/main/java/ui/window/JDialogSystemCGeneration.java | 3 +++
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/doc/config_linux.xml b/doc/config_linux.xml
index 7bd465be95..5b437544a4 100755
--- a/doc/config_linux.xml
+++ b/doc/config_linux.xml
@@ -19,7 +19,7 @@
<JavaHeader data="import java.sql.*;" />
<SystemCCodeDirectory data="../simulators/c++2/" />
<SystemCHost data="localhost"/>
-<SystemCCodeCompileCommand data="make -C ../simulators/c++2/" />
+<SystemCCodeCompileCommand data="make" />
<SystemCCodeExecuteCommand data="../simulators/c++2/run.x -ovcd ../simulators/c++2/vcddump.vcd" />
<SystemCCodeInteractiveExecuteCommand data="../simulators/c++2/run.x -server" />
<TMLCodeDirectory data="../tmlcode" />
diff --git a/doc/config_macosx.xml b/doc/config_macosx.xml
index 5f17e22a9e..be6a05674c 100755
--- a/doc/config_macosx.xml
+++ b/doc/config_macosx.xml
@@ -19,7 +19,7 @@
<JavaHeader data="import java.sql.*;" />
<SystemCCodeDirectory data="../simulators/c++2/" />
<SystemCHost data="localhost"/>
-<SystemCCodeCompileCommand data="make -C ../simulators/c++2/" />
+<SystemCCodeCompileCommand data="make" />
<SystemCCodeExecuteCommand data="../simulators/c++2/run.x -ovcd ../simulators/c++2/vcddump.vcd" />
<SystemCCodeInteractiveExecuteCommand data="../simulators/c++2/run.x -server" />
<TMLCodeDirectory data="../tmlcode" />
diff --git a/doc/config_windows.xml b/doc/config_windows.xml
index a05f8eae43..84935d1a7e 100755
--- a/doc/config_windows.xml
+++ b/doc/config_windows.xml
@@ -19,7 +19,7 @@
<JavaHeader data="import java.sql.*;" />
<SystemCCodeDirectory data="../simulators/c++2/" />
<SystemCHost data="localhost"/>
-<SystemCCodeCompileCommand data="make -C ../simulators/c++2/" />
+<SystemCCodeCompileCommand data="make" />
<SystemCCodeExecuteCommand data="../simulators/c++2/run.x -ovcd ../simulators/c++2/vcddump.vcd" />
<SystemCCodeInteractiveExecuteCommand data="../simulators/c++2/run.x -server" />
<TMLCodeDirectory data="../tmlcode" />
diff --git a/src/main/java/ui/window/JDialogSystemCGeneration.java b/src/main/java/ui/window/JDialogSystemCGeneration.java
index 8b54efee7f..0c221c7668 100755
--- a/src/main/java/ui/window/JDialogSystemCGeneration.java
+++ b/src/main/java/ui/window/JDialogSystemCGeneration.java
@@ -164,6 +164,9 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
pathCode = _pathCode;
pathCompiler = _pathCompiler;
+ if (!(pathCompiler.contains("-C "))) {
+ pathCompiler = pathCompiler + " -C " + pathCode;
+ }
pathExecute = _pathExecute;
--
GitLab