added makefile and cleaned builder file

4 files changed, 24 insertions, 8 deletions

diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index bcc38d4..3c9feee 100644
--- a/jar/scilab_en_US_help.jar
+++ b/jar/scilab_en_US_help.jar
diff --git a/sci_gateway/cpp/builder_gateway_cpp.sce b/sci_gateway/cpp/builder_gateway_cpp.sce
index 79b7d18..32d8db9 100755
--- a/sci_gateway/cpp/builder_gateway_cpp.sce
+++ b/sci_gateway/cpp/builder_gateway_cpp.sce
@@ -5,9 +5,8 @@
 // you should have received as part of this distribution.  The terms
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-// Author: Harpreet Singh, Yash Kataria, Adarsh Shah
+// Author: Rupak Rokade
 // Organization: FOSSEE, IIT Bombay
-// Email: toolbox@scilab.in
 
 mode(-1)
 lines(0)
@@ -38,17 +37,15 @@ 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() + 'windows' + filesep() + 'include';
-    //inc_base_dir = third_dir + filesep() + 'linux' + filesep() + 'include' + filesep() + 'coin';
-    //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+' ']   
-    Linker_Flag  = [lib_base_dir+"libcoinblas.lib "]
+    Linker_Flag  = [lib_base_dir+"libraryname.lib "]
 
 elseif getos()=="Darwin" then 
 	third_dir = path_builder+filesep()+'..'+filesep()+'..'+filesep()+'thirdparty';
     	lib_base_dir = third_dir + filesep() + 'Mac' + filesep() + 'lib' + filesep() + Version + filesep();
-    	inc_base_dir = third_dir + filesep() + 'Mac' + filesep() + 'include' + filesep() + 'coin';
+    	inc_base_dir = third_dir + filesep() + 'Mac' + 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+"libSym"+" "+"-L"+lib_base_dir+"libipopt"+" "+"-L"+lib_base_dir+"libClp"+" "+"-L"+lib_base_dir+"libOsiClp"+" "+"-L"+lib_base_dir+"libCoinUtils" + " "+"-L"+lib_base_dir+"libbonmin" ]
+    	Linker_Flag = ["-L"+lib_base_dir+"libnames"]
 
 else//LINUX
 
@@ -63,7 +60,6 @@ else//LINUX
 
 end
 
-//disp("printing ?????")
 tbx_build_gateway(toolbox_title,Function_Names,Files,get_absolute_file_path("builder_gateway_cpp.sce"), [], Linker_Flag, C_Flags,[]);
 
 clear toolbox_title Function_Names Files Linker_Flag C_Flags;
diff --git a/src/Makefile b/src/Makefile
new file mode 100755
index 0000000..d4719ac
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,20 @@
+LIBNAME = add
+
+all: lib$(LIBNAME).so test$(LIBNAME)
+
+$(LIBNAME).o: $(LIBNAME).h $(LIBNAME).c
+	gcc -fPIC -c $(LIBNAME).c
+
+lib$(LIBNAME).so: $(LIBNAME).o
+	gcc -shared -o lib$(LIBNAME).so $(LIBNAME).o
+
+test$(LIBNAME): lib$(LIBNAME).so main.c add.h
+	gcc -Wall -L$(PWD) -Wl,-rpath=$(PWD) -o $@ main.c -l$(LIBNAME) -g
+
+install:
+	cp add.h ../thirdparty/linux/include/
+	cp libadd.so ../thirdparty/linux/lib/x64/
+
+.PHONY: clean
+clean:
+	$(RM) -f *.so *.o test
diff --git a/src/test b/src/testadd
index 8990420..8990420 100755
--- a/src/test
+++ b/src/testadd