diff --git a/config.w32 b/config.w32 index 81199c3..b49df6a 100644 --- a/config.w32 +++ b/config.w32 @@ -1,13 +1,32 @@ // $Id$ // vim:ft=javascript -// If your extension references something external, use ARG_WITH -// ARG_WITH("opencv", "for opencv support", "no"); +ARG_WITH("opencv", "for opencv support", "no"); -// Otherwise, use ARG_ENABLE -// ARG_ENABLE("opencv", "enable opencv support", "no"); +var opencv_source_file="opencv.cc "+ +"source/opencv2/opencv_core.cc "+ +"source/opencv2/opencv_highgui.cc "+ +"source/opencv2/core/opencv_mat.cc "+ +"source/opencv2/core/opencv_utility.cc "+ +"source/opencv2/opencv_imgcodecs.cc "+ +"opencv_exception.cc "+ +"source/opencv2/core/hal/opencv_interface.cc "+ +"source/opencv2/imgcodecs/opencv_imgcodecs_c.cc "+ +"source/opencv2/core/opencv_type.cc "+ +"source/opencv2/opencv_imgproc.cc "+ +"source/opencv2/core/opencv_base.cc "+ +"source/opencv2/core/opencv_persistence.cc "+ +"source/opencv2/opencv_objdetect.cc "+ +"source/opencv2/opencv_videoio.cc "+ +"source/opencv2/opencv_face.cc "+ +"source/opencv2/face/opencv_facerec.cc "+ +"source/opencv2/face/opencv_facemarkLBF.cc "+ +"source/opencv2/core/opencv_cvdef.cc "+ +"source/opencv2/dnn/opencv_dnn.cc "+ +"source/opencv2/opencv_ml.cc" if (PHP_OPENCV != "no") { - EXTENSION("opencv", "opencv.cc", PHP_EXTNAME_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); -} - + EXTENSION("opencv", opencv_source_file, "opencv", "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); +}else { + WARNING("Opencv not enabled, headers or libraries not found"); +} \ No newline at end of file diff --git a/php_opencv.h b/php_opencv.h index 5bbb068..7af3b09 100644 --- a/php_opencv.h +++ b/php_opencv.h @@ -29,7 +29,7 @@ extern "C" { extern zend_module_entry opencv_module_entry; #define phpext_opencv_ptr &opencv_module_entry -#define PHP_OPENCV_VERSION "0.1.0" /* Replace with version number for your extension */ +#define PHP_OPENCV_VERSION "4.6.0" /* Replace with version number for your extension */ #ifdef PHP_WIN32 # define PHP_OPENCV_API __declspec(dllexport) @@ -41,7 +41,7 @@ extern zend_module_entry opencv_module_entry; #include //include opencv code -#include +#include #include using namespace cv; @@ -50,7 +50,6 @@ using namespace cv; #define OPENCV_FACE_NS ZEND_NS_NAME(OPENCV_NS,"Face") #define OPENCV_ML_NS ZEND_NS_NAME(OPENCV_NS,"ML") #define OPENCV_DNN_NS ZEND_NS_NAME(OPENCV_NS,"DNN") - #define OPENCV_CONNECT(text1,text2) text1##text2