From c7e9597db39140c1d982f796a8e1f03bb54e7905 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Mon, 24 Apr 2017 14:08:37 +0530 Subject: Fixed float.h issue. OpenCV with built libraries working for linux x64 --- macros/CCodeGeneration/C_FinalizeCode.bin | Bin 18232 -> 0 bytes macros/CCodeGeneration/C_ForExpression.bin | Bin 32208 -> 0 bytes macros/CCodeGeneration/C_Funcall.bin | Bin 73176 -> 0 bytes macros/CCodeGeneration/C_GenDeclarations.bin | Bin 22004 -> 0 bytes macros/CCodeGeneration/C_GenerateFunName.bin | Bin 7776 -> 0 bytes macros/CCodeGeneration/C_GenerateLaunchScript.bin | Bin 17232 -> 0 bytes macros/CCodeGeneration/C_GenerateMakefile.bin | Bin 37240 -> 0 bytes macros/CCodeGeneration/C_GenerateMakefile.sci | 11 +++++++--- macros/CCodeGeneration/C_GenerateMakefile_msvc.bin | Bin 23412 -> 0 bytes macros/CCodeGeneration/C_GenerateSCI2CHeader.bin | Bin 1936 -> 0 bytes macros/CCodeGeneration/C_IfElseBlocks.bin | Bin 8516 -> 0 bytes macros/CCodeGeneration/C_IfExpression.bin | Bin 10612 -> 0 bytes macros/CCodeGeneration/C_IndentBlanks.bin | Bin 3184 -> 0 bytes macros/CCodeGeneration/C_InitHeader.bin | Bin 14140 -> 0 bytes macros/CCodeGeneration/C_MemAllocOutTempVars.bin | Bin 12996 -> 0 bytes macros/CCodeGeneration/C_SCI2CHeader.bin | Bin 7268 -> 0 bytes macros/CCodeGeneration/C_Type.bin | Bin 6816 -> 0 bytes macros/CCodeGeneration/C_WhileExpression.bin | Bin 13196 -> 0 bytes macros/CCodeGeneration/GenCFunDatFiles.bin | Bin 9348 -> 0 bytes macros/CCodeGeneration/GetClsFileName.bin | Bin 13340 -> 0 bytes macros/CCodeGeneration/GetSymbolDimension.bin | Bin 8944 -> 0 bytes macros/CCodeGeneration/GetWhileCondVariable.bin | Bin 10228 -> 0 bytes macros/CCodeGeneration/JoinDeclarAndCcode.bin | Bin 22776 -> 0 bytes macros/CCodeGeneration/Sci2AnnotationFile.bin | Bin 7400 -> 0 bytes macros/CCodeGeneration/lib | Bin 1257 -> 0 bytes macros/CCodeGeneration/names | 23 --------------------- 26 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 macros/CCodeGeneration/C_FinalizeCode.bin delete mode 100644 macros/CCodeGeneration/C_ForExpression.bin delete mode 100644 macros/CCodeGeneration/C_Funcall.bin delete mode 100644 macros/CCodeGeneration/C_GenDeclarations.bin delete mode 100644 macros/CCodeGeneration/C_GenerateFunName.bin delete mode 100644 macros/CCodeGeneration/C_GenerateLaunchScript.bin delete mode 100644 macros/CCodeGeneration/C_GenerateMakefile.bin delete mode 100644 macros/CCodeGeneration/C_GenerateMakefile_msvc.bin delete mode 100644 macros/CCodeGeneration/C_GenerateSCI2CHeader.bin delete mode 100644 macros/CCodeGeneration/C_IfElseBlocks.bin delete mode 100644 macros/CCodeGeneration/C_IfExpression.bin delete mode 100644 macros/CCodeGeneration/C_IndentBlanks.bin delete mode 100644 macros/CCodeGeneration/C_InitHeader.bin delete mode 100644 macros/CCodeGeneration/C_MemAllocOutTempVars.bin delete mode 100644 macros/CCodeGeneration/C_SCI2CHeader.bin delete mode 100644 macros/CCodeGeneration/C_Type.bin delete mode 100644 macros/CCodeGeneration/C_WhileExpression.bin delete mode 100644 macros/CCodeGeneration/GenCFunDatFiles.bin delete mode 100644 macros/CCodeGeneration/GetClsFileName.bin delete mode 100644 macros/CCodeGeneration/GetSymbolDimension.bin delete mode 100644 macros/CCodeGeneration/GetWhileCondVariable.bin delete mode 100644 macros/CCodeGeneration/JoinDeclarAndCcode.bin delete mode 100644 macros/CCodeGeneration/Sci2AnnotationFile.bin delete mode 100644 macros/CCodeGeneration/lib delete mode 100644 macros/CCodeGeneration/names (limited to 'macros/CCodeGeneration') diff --git a/macros/CCodeGeneration/C_FinalizeCode.bin b/macros/CCodeGeneration/C_FinalizeCode.bin deleted file mode 100644 index b4005914..00000000 Binary files a/macros/CCodeGeneration/C_FinalizeCode.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_ForExpression.bin b/macros/CCodeGeneration/C_ForExpression.bin deleted file mode 100644 index 1c3f6747..00000000 Binary files a/macros/CCodeGeneration/C_ForExpression.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_Funcall.bin b/macros/CCodeGeneration/C_Funcall.bin deleted file mode 100644 index 80fda7c4..00000000 Binary files a/macros/CCodeGeneration/C_Funcall.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_GenDeclarations.bin b/macros/CCodeGeneration/C_GenDeclarations.bin deleted file mode 100644 index 62636dc5..00000000 Binary files a/macros/CCodeGeneration/C_GenDeclarations.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_GenerateFunName.bin b/macros/CCodeGeneration/C_GenerateFunName.bin deleted file mode 100644 index 1b723f16..00000000 Binary files a/macros/CCodeGeneration/C_GenerateFunName.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_GenerateLaunchScript.bin b/macros/CCodeGeneration/C_GenerateLaunchScript.bin deleted file mode 100644 index 587c1547..00000000 Binary files a/macros/CCodeGeneration/C_GenerateLaunchScript.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_GenerateMakefile.bin b/macros/CCodeGeneration/C_GenerateMakefile.bin deleted file mode 100644 index b4a4750e..00000000 Binary files a/macros/CCodeGeneration/C_GenerateMakefile.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_GenerateMakefile.sci b/macros/CCodeGeneration/C_GenerateMakefile.sci index 7ea24437..07891c56 100644 --- a/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/macros/CCodeGeneration/C_GenerateMakefile.sci @@ -85,9 +85,14 @@ else PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y'); if(SharedInfo.OpenCVUsed == %T) - PrintStringInfo('LDFLAGS += `pkg-config --libs opencv`',FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('CFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('CXXFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y'); + //PrintStringInfo('LDFLAGS += `pkg-config --libs opencv`',FileInfo.MakefileFilename,'file','y','y'); + //PrintStringInfo('CFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y'); + //PrintStringInfo('CXXFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS += -lopencv_objdetect -lopencv_ocl -lopencv_photo -lopencv_stitching -lopencv_superres',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS += -lopencv_ts -lopencv_video -lopencv_videostab -lopencv_core -lrt -lpthread -lm -ldl', FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS += -lIlmImf -ljpeg -ljasper -ltiff -lpng -lzlib -lstdc++',FileInfo.MakefileFilename,'file','y','y'); end end diff --git a/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin b/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin deleted file mode 100644 index aa34f7db..00000000 Binary files a/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin b/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin deleted file mode 100644 index 2e02cae4..00000000 Binary files a/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_IfElseBlocks.bin b/macros/CCodeGeneration/C_IfElseBlocks.bin deleted file mode 100644 index 332e89bf..00000000 Binary files a/macros/CCodeGeneration/C_IfElseBlocks.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_IfExpression.bin b/macros/CCodeGeneration/C_IfExpression.bin deleted file mode 100644 index c6cda7bd..00000000 Binary files a/macros/CCodeGeneration/C_IfExpression.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_IndentBlanks.bin b/macros/CCodeGeneration/C_IndentBlanks.bin deleted file mode 100644 index 77bfaebc..00000000 Binary files a/macros/CCodeGeneration/C_IndentBlanks.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_InitHeader.bin b/macros/CCodeGeneration/C_InitHeader.bin deleted file mode 100644 index 567822c0..00000000 Binary files a/macros/CCodeGeneration/C_InitHeader.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_MemAllocOutTempVars.bin b/macros/CCodeGeneration/C_MemAllocOutTempVars.bin deleted file mode 100644 index 443ad3c1..00000000 Binary files a/macros/CCodeGeneration/C_MemAllocOutTempVars.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_SCI2CHeader.bin b/macros/CCodeGeneration/C_SCI2CHeader.bin deleted file mode 100644 index 1d3e6182..00000000 Binary files a/macros/CCodeGeneration/C_SCI2CHeader.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_Type.bin b/macros/CCodeGeneration/C_Type.bin deleted file mode 100644 index 7b5bf444..00000000 Binary files a/macros/CCodeGeneration/C_Type.bin and /dev/null differ diff --git a/macros/CCodeGeneration/C_WhileExpression.bin b/macros/CCodeGeneration/C_WhileExpression.bin deleted file mode 100644 index cff8f38d..00000000 Binary files a/macros/CCodeGeneration/C_WhileExpression.bin and /dev/null differ diff --git a/macros/CCodeGeneration/GenCFunDatFiles.bin b/macros/CCodeGeneration/GenCFunDatFiles.bin deleted file mode 100644 index 6a374f5b..00000000 Binary files a/macros/CCodeGeneration/GenCFunDatFiles.bin and /dev/null differ diff --git a/macros/CCodeGeneration/GetClsFileName.bin b/macros/CCodeGeneration/GetClsFileName.bin deleted file mode 100644 index 30b25713..00000000 Binary files a/macros/CCodeGeneration/GetClsFileName.bin and /dev/null differ diff --git a/macros/CCodeGeneration/GetSymbolDimension.bin b/macros/CCodeGeneration/GetSymbolDimension.bin deleted file mode 100644 index 5c73f435..00000000 Binary files a/macros/CCodeGeneration/GetSymbolDimension.bin and /dev/null differ diff --git a/macros/CCodeGeneration/GetWhileCondVariable.bin b/macros/CCodeGeneration/GetWhileCondVariable.bin deleted file mode 100644 index 6815fb4b..00000000 Binary files a/macros/CCodeGeneration/GetWhileCondVariable.bin and /dev/null differ diff --git a/macros/CCodeGeneration/JoinDeclarAndCcode.bin b/macros/CCodeGeneration/JoinDeclarAndCcode.bin deleted file mode 100644 index 084ab085..00000000 Binary files a/macros/CCodeGeneration/JoinDeclarAndCcode.bin and /dev/null differ diff --git a/macros/CCodeGeneration/Sci2AnnotationFile.bin b/macros/CCodeGeneration/Sci2AnnotationFile.bin deleted file mode 100644 index 95fe5611..00000000 Binary files a/macros/CCodeGeneration/Sci2AnnotationFile.bin and /dev/null differ diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib deleted file mode 100644 index 40c39d02..00000000 Binary files a/macros/CCodeGeneration/lib and /dev/null differ diff --git a/macros/CCodeGeneration/names b/macros/CCodeGeneration/names deleted file mode 100644 index efbb400a..00000000 --- a/macros/CCodeGeneration/names +++ /dev/null @@ -1,23 +0,0 @@ -C_FinalizeCode -C_ForExpression -C_Funcall -C_GenDeclarations -C_GenerateFunName -C_GenerateLaunchScript -C_GenerateMakefile -C_GenerateMakefile_msvc -C_GenerateSCI2CHeader -C_IfElseBlocks -C_IfExpression -C_IndentBlanks -C_InitHeader -C_MemAllocOutTempVars -C_SCI2CHeader -C_Type -C_WhileExpression -GenCFunDatFiles -GetClsFileName -GetSymbolDimension -GetWhileCondVariable -JoinDeclarAndCcode -Sci2AnnotationFile -- cgit