From b31a4a5f8a03f516d6ec21efb31f9892cb46f9f3 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Wed, 2 Mar 2016 14:20:36 +0530
Subject: Intermediate commit

---
 .../macros/CCodeGeneration/C_GenerateMakefile.bin  | Bin 24940 -> 26144 bytes
 .../macros/CCodeGeneration/C_GenerateMakefile.sci  |  35 +++++++++++----------
 2 files changed, 18 insertions(+), 17 deletions(-)

(limited to '2.3-1/macros/CCodeGeneration')

diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin
index feff05f8..43de2290 100644
Binary files a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin and b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin differ
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
index 1ef5a411..4817af1e 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
@@ -56,25 +56,26 @@ PrintStringInfo('LIBDIR     = '+makelibdir,FileInfo.MakefileFilename,'file','y',
 PrintStringInfo('SCI2CDIR    = .',FileInfo.MakefileFilename,'file','y','y');
 
 if getos() == 'Windows' then   
-
-    // Compiler definition
-if (target == 'RPi')
-	PrintStringInfo('CC     = arm-linux-gnueabihf-gcc ',FileInfo.MakefileFilename,'file','y','y');
-else
-	PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
-end 
-PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
-if (target == 'RPi')
-	PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lm -lbcm2835',FileInfo.MakefileFilename,'file','y','y');
-else
-	PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
-end
-else 
+  
      // Compiler definition
-    PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
-    PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR)',FileInfo.MakefileFilename,'file','y','y');
-    PrintStringInfo('LDFLAGS = -lblas -llapack -lm',FileInfo.MakefileFilename,'file','y','y');
+     PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
+     PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR)',FileInfo.MakefileFilename,'file','y','y');
+     PrintStringInfo('LDFLAGS = -L./ -lblasplus -llapack -lm',FileInfo.MakefileFilename,'file','y','y');   //Added -L./ and -lblasplus(previously it was -lblas)
+     
+else 
+	if (target == 'RPi')
+		PrintStringInfo('CC     = arm-linux-gnueabihf-gcc ',FileInfo.MakefileFilename,'file','y','y');
+	else
+		PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
+	end 
+	PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
+	if (target == 'RPi')
+		PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lm -lbcm2835',FileInfo.MakefileFilename,'file','y','y');
+	else
+		PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
+	end
 end
+
 // Binary definition
 PrintStringInfo('EXEFILENAME = mytest.exe',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)', FileInfo.MakefileFilename,'file','y','y');
-- 
cgit