diff options
| author | harpreet | 2016-07-01 00:11:55 +0530 |
|---|---|---|
| committer | harpreet | 2016-07-01 00:11:55 +0530 |
| commit | 89b96cb79cbe75ba8c1afea61b3caca37a083f62 (patch) | |
| tree | 1b879fb0dce2406c1c49bf5bdabcedfb12ff020c /etc | |
| parent | 10e2e4d8b4a7592a8631ddac8e8d1664d6f0b9e3 (diff) | |
| download | FOSSEE-Optimization-toolbox-89b96cb79cbe75ba8c1afea61b3caca37a083f62.tar.gz FOSSEE-Optimization-toolbox-89b96cb79cbe75ba8c1afea61b3caca37a083f62.tar.bz2 FOSSEE-Optimization-toolbox-89b96cb79cbe75ba8c1afea61b3caca37a083f62.zip | |
Windows Included
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/FOSSEE_Optimization_Toolbox.quit | 4 | ||||
| -rw-r--r-- | etc/FOSSEE_Optimization_Toolbox.start | 22 |
2 files changed, 5 insertions, 21 deletions
diff --git a/etc/FOSSEE_Optimization_Toolbox.quit b/etc/FOSSEE_Optimization_Toolbox.quit index 8e6aa18..5bc3b4c 100644 --- a/etc/FOSSEE_Optimization_Toolbox.quit +++ b/etc/FOSSEE_Optimization_Toolbox.quit @@ -27,10 +27,8 @@ function quitModule() if getscilabmode() == "STD" then removeModulePreferences(root_tlbx); end - + ulink(); endfunction - -quitModule(); clear quitModule; diff --git a/etc/FOSSEE_Optimization_Toolbox.start b/etc/FOSSEE_Optimization_Toolbox.start index d6dcfb1..5ab588a 100644 --- a/etc/FOSSEE_Optimization_Toolbox.start +++ b/etc/FOSSEE_Optimization_Toolbox.start @@ -11,11 +11,6 @@ mprintf("Start FOSSEE Optimization Toolbox\n"); -if ( isdef("sym_open") ) then - warning("Library is already loaded"); - return; -end - etc_tlbx = get_absolute_file_path("FOSSEE_Optimization_Toolbox.start"); etc_tlbx = getshortpathname(etc_tlbx); root_tlbx = strncpy( etc_tlbx, length(etc_tlbx)-length("\etc\") ); @@ -35,7 +30,9 @@ mprintf("\tLoad gateways\n"); Version = opt(2); ilib_verbose(0); if getos()=="Windows" then - error(msprintf(gettext("Module is not for Windows."))); + lib_path = root_tlbx + "/thirdparty/windows/lib/" + Version; + link(lib_path+filesep()+"IpOptFSS.dll"); + link(lib_path+filesep()+"IpOpt-vc10.dll"); else lib_path = root_tlbx + "/thirdparty/linux/lib/" + Version; link(lib_path + "/libCoinUtils.so"); @@ -47,15 +44,6 @@ else link(lib_path + "/libCgl.so"); link(lib_path + "/libSym.so"); link(lib_path + "/libOsiSym.so"); - try - link(lib_path + "/libcoinblas.so"); - catch - if(~isfile('/usr/lib/x86_64-linux-gnu/libstdc++.so.6') | ~isfile('/usr/lib/x86_64-linux-gnu/libgfortran.so.3')) then - errmsg = msprintf(gettext("%s: Please install gfortran"), "FOSSEE_Optimization_Toolbox"); - error(errmsg); - end - unix_s('export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libstdc++.so.6:/usr/lib/x86_64-linux-gnu/libgfortran.so.3') - end link(lib_path + "/libcoinblas.so"); link(lib_path + "/libcoinlapack.so"); link(lib_path + "/libcoinmumps.so"); @@ -91,6 +79,4 @@ end // ============================================================================= -clear root_tlbx; -clear etc_tlbx; - +clear etc_tlbx root_tlbx Version a opt lib_path; |