From: davila <> Date: Tue, 21 Sep 2010 17:39:11 +0000 (+0000) Subject: no message X-Git-Tag: v1_0_0~40 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b359a2acffe192eb5f8e23b0bfaab553e228c747;p=bbtkGEditor.git no message --- diff --git a/appli/bbEditor/CMakeLists.txt b/appli/bbEditor/CMakeLists.txt index 69c2a4f..06762ff 100644 --- a/appli/bbEditor/CMakeLists.txt +++ b/appli/bbEditor/CMakeLists.txt @@ -23,6 +23,7 @@ ENDIF(BBTK_USE_WXWIDGETS AND WIN32) TARGET_LINK_LIBRARIES(bbEditor + crea bbsWxGUIEditorGraphic bbsKernelEditorGraphic bbsVtkGUIEditorGraphic diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index 4cc563c..f5027ed 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx @@ -35,6 +35,7 @@ Version: $Revision$ #include "bbtkwxGUIEditorGraphicBBS.h" #include "creaWx.h" +#include "creaSystem.h" #include @@ -349,13 +350,20 @@ namespace bbtk tempFile.open(filename.c_str()); tempFile << script; tempFile.close(); - - std::string command = "\""; + std::string command = "\""+ crea::System::GetExecutablePath(); + + +#ifdef MACOSX + command += separator + "../../../bbi.app/Contents/MacOS"; +#endif + #ifdef WIN32 command += "\""; #endif - + + /* + //command += ConfigurationFile::GetInstance().Get_bin_path(); //EED command +="C:/temp/bbtkBIN/RelWithDebInfo//"; //EED command +="C:/Program Files/CreaTools/bbtk-0.9.5/bin"; @@ -367,8 +375,9 @@ namespace bbtk command +="."; command += separator + "bbi\" "; #endif + */ + command += separator + "bbi\" "; command += "\""+filename + "\""; - #ifdef WIN32 command += "\""; #endif