diff options
Diffstat (limited to 'sci_gateway/cpp/builder_gateway_cpp.sce')
| -rw-r--r-- | sci_gateway/cpp/builder_gateway_cpp.sce | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/sci_gateway/cpp/builder_gateway_cpp.sce b/sci_gateway/cpp/builder_gateway_cpp.sce index b83ab7a..0b5f9cb 100644 --- a/sci_gateway/cpp/builder_gateway_cpp.sce +++ b/sci_gateway/cpp/builder_gateway_cpp.sce @@ -37,13 +37,17 @@ Version = opt(2); //Build_64Bits = %f; if getos()=="Windows" then - - third_dir = path_builder+filesep()+'..'+filesep()+'..'+filesep()+'thirdparty'; - lib_base_dir = third_dir + filesep() + 'windows' + filesep() + 'lib' + filesep() + Version + filesep(); - inc_base_dir = third_dir + filesep() + 'linux' + filesep() + 'include'; - threads_dir=third_dir + filesep() + 'linux' + filesep() + 'include' + filesep() + 'pthreads-win32'; - C_Flags=['-D__USE_DEPRECATED_STACK_FUNCTIONS__ -I -w '+path_builder+' '+ '-I '+inc_base_dir+' '+'-I '+threads_dir+' '] - Linker_Flag = [lib_base_dir+"liblibraryname.lib"] + third_dir = path_builder+filesep()+'..'+filesep()+'..'+filesep()+'thirdparty'; + lib_base_dir = third_dir + filesep() + 'windows' + filesep() + 'lib' + filesep(); + inc_base_dir = third_dir + filesep() + 'windows' + filesep() + 'include'+ filesep(); + octave_lib_dir = "C:\Octave\Octave-4.4.1\bin\"; + C_Flags=[' -D__USE_DEPRECATED_STACK_FUNCTIONS__ -I -w '+ path_builder + ' '+ ' -I ' + inc_base_dir + ' ']; + libs = [ + lib_base_dir + "libfun"; + octave_lib_dir + "liboctave-6"; + octave_lib_dir + "liboctinterp-6"; + ]; + Linker_Flag = ""; elseif getos()=="Darwin" then third_dir = path_builder+filesep()+'..'+filesep()+'..'+filesep()+'thirdparty'; @@ -51,7 +55,7 @@ elseif getos()=="Darwin" then inc_base_dir = third_dir + filesep() + 'linux' + filesep() + 'include'; C_Flags=["-D__USE_DEPRECATED_STACK_FUNCTIONS__ -w -fpermissive -I"+path_builder+" -I"+inc_base_dir+" -Wl,-rpath "+lib_base_dir+" "] Linker_Flag = ["-L"+lib_base_dir+"liblibraryname"]; - + libs = []; else//LINUX third_dir = path_builder+filesep()+'..'+filesep()+'..'+filesep()+'thirdparty'; @@ -61,12 +65,12 @@ else//LINUX C_Flags = ["-I"+inc_base_dir]; Linker_Flag = ["-L" + lib_base_dir + " -lfun -Wl,-rpath="+lib_base_dir+" -loctave -loctinterp"] - + libs = []; //disp(C_Flags); //disp(Linker_Flag); end -tbx_build_gateway(toolbox_title,Function_Names,Files,get_absolute_file_path("builder_gateway_cpp.sce"), [], Linker_Flag, C_Flags,[]); +tbx_build_gateway(toolbox_title,Function_Names,Files,get_absolute_file_path("builder_gateway_cpp.sce"), libs, Linker_Flag, C_Flags); clear toolbox_title Function_Names Files Linker_Flag C_Flags; |