update windows phone build script.

Emgu.CV.Extern/CMakeLists.txt

@@ -59,14 +59,18 @@ CREATE_VECTOR_CS("PointF" "cv::Point2f" "PointF" "struct" ${CMAKE_CURRENT_SOURCE
 CREATE_VECTOR_CS("Point3D32F" "cv::Point3f" "MCvPoint3D32f" "struct" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV/Util Emgu.CV.Util)
 CREATE_VECTOR_CS("Rect" "cv::Rect" "Rectangle" "struct" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV/Util Emgu.CV.Util)
 CREATE_VECTOR_CS("KeyPoint" "cv::KeyPoint" "MKeyPoint" "struct" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV/Util Emgu.CV.Util)
-CREATE_VECTOR_CS("ERStat" "cv::text::ERStat" "MCvERStat" "struct" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV.Contrib/Text Emgu.CV.Text "#include \"opencv2/text/erfilter.hpp\"")
+
 CREATE_VECTOR_CS("DMatch" "cv::DMatch" "MDMatch" "struct" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV/Util Emgu.CV.Util)
 CREATE_VECTOR_CS("Triangle2DF" "cv::Vec6f" "Triangle2DF" "struct" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV/Util Emgu.CV.Util)
 
-IF(BUILD_opencv_latentsvm)
+IF(HAVE_opencv_latentsvm)
   CREATE_VECTOR_CS("ObjectDetection" "cv::lsvm::LSVMDetector::ObjectDetection" "MCvObjectDetection" "struct" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV/Util Emgu.CV.Util "#include \"opencv2/latentsvm.hpp\"")
 ENDIF()
 
+IF(HAVE_opencv_text)
+  CREATE_VECTOR_CS("ERStat" "cv::text::ERStat" "MCvERStat" "struct" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV.Contrib/Text Emgu.CV.Text "#include \"opencv2/text/erfilter.hpp\"")
+ENDIF()
+
 CREATE_VECTOR_CS("Mat" "cv::Mat" "Mat" "object" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV/Util Emgu.CV.Util)
 CREATE_VECTOR_CS("UMat" "cv::UMat" "UMat" "object" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV/Util Emgu.CV.Util)
 CREATE_VECTOR_CS("CvString" "cv::String" "CvString" "object" ${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV/Util Emgu.CV.Util)
@@ -294,7 +298,7 @@ void cve${CLASS_NAME}Set${CS_FUNCTION_NAME}(${CLASS_NAME_FULL}* obj, ${PROPERTY_
 ENDMACRO()
 
 ############################### core code gen START ##############################
-IF(BUILD_opencv_core)
+IF(HAVE_opencv_core)
   CREATE_OCV_CLASS_PROPERTY( 
   "core/mat_property" 
   "${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV/MatGenerated.cs"
@@ -365,7 +369,7 @@ ENDIF()
 ############################### core code gen END ################################
 
 ############################### ml code gen START ##############################
-IF(BUILD_opencv_ml)
+IF(HAVE_opencv_ml)
   CREATE_OCV_CLASS_PROPERTY( 
   "ml/em_property" 
   "${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV.ML/EMGenerated.cs"
@@ -539,7 +543,9 @@ FOREACH(CVEXTERN_OPTIONAL_DEP ${OPENCV_MODULE_NAMES})
 
   #MESSAGE("Retriveing source folder for project :  opencv_${CVEXTERN_OPTIONAL_DEP}")
   #GET_TARGET_PROPERTY(OPENCV_MODULE_SOURCE_DIR opencv_${CVEXTERN_OPTIONAL_DEP} PROJECT_SOURCE_DIR)
+  IF (HAVE_opencv_${CVEXTERN_OPTIONAL_DEP})
     INCLUDE_DIRECTORIES("${opencv_${CVEXTERN_OPTIONAL_DEP}_SOURCE_DIR}/include")
+  ENDIF()
   #MESSAGE("Included:  ${opencv_${CVEXTERN_OPTIONAL_DEP}_SOURCE_DIR}/include")
 
   SET(CVEXTERN_OPTIONAL_DIR "${PROJECT_SOURCE_DIR}/${CVEXTERN_OPTIONAL_DEP}")
@@ -844,12 +850,6 @@ IF(ANDROID OR APPLE)
   LIST(REMOVE_ITEM extern_hdrs ${extern_hdrs_excludes})
 ENDIF()
 
-
-#source_group("Src_cuda" FILES ${gpu_extern_srcs})
-#source_group("Include_cuda" FILES ${gpu_extern_hdrs})
-#source_group("Src_nonfree" FILES ${nonfree_srcs})
-#source_group("Include_nonfree" FILES ${nonfree_extern_hdrs})
-
 set(the_target ${PROJECT_NAME})
 add_library(${the_target} ${extern_srcs} ${extern_hdrs} )
 

Emgu.CV.Extern/cvblob/CMakeLists.txt

@@ -16,9 +16,11 @@ INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/ml/include")
 INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/calib3d/include")
 INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/objdetect/include")
 INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/features2d/include")
-#INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/legacy/include")
-#INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/contrib/include")
-INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/highgui/include")
+INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/imgcodecs/include")
+INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/videoio/include")
+if (HAVE_opencv_highgui)
+  INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/highgui/include")
+ENDIF()
 INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/flann/include")
 INCLUDE_DIRECTORIES("${OPENCV_MODULES_DIR}/video/include")
 

Emgu.CV.Extern/libgeotiff/CMakeLists.txt

@@ -71,6 +71,15 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${GEOTIFF_BUILD_OUTPUT_DIRECTORY})
 ###############################################################################
 # Platform and compiler specific settings
 
+        IF(NETFX_CORE)
+          MESSAGE(STATUS "Disabling depreciation")
+          ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+          #ADD_DEFINITIONS(/sdl-)
+          #target_compile_options(geotiff_archive PRIVATE -sdl-)
+          #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -sdl-")
+          #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -sdl-")
+        ENDIF()
+
 IF(WIN32)
     IF(MSVC) 
         ADD_DEFINITIONS(-DBUILD_AS_DLL=1)

platforms/windows/Build_Binary_x86.bat

@@ -215,6 +215,9 @@ GOTO CONFIGURE_WINDOWS_STORE_OR_PHONE
 
 :CONFIGURE_WINDOWS_STORE_OR_PHONE
 SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% ^
+-DBUILD_opencv_videostab:BOOL=OFF ^
+-DBUILD_opencv_text:BOOL=OFF ^
+-DEMGU_CV_WITH_CVBLOB:BOOL=OFF ^
 -DNETFX_CORE:BOOL=TRUE ^
 -DWITH_DIRECTX:BOOL=FALSE ^
 -DWITH_OPENEXR:BOOL=FALSE ^
@@ -228,8 +231,7 @@ SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% ^
 -DWITH_MSMF:BOOL=FALSE ^
 -DWITH_FFMPEG:BOOL=FALSE ^
 -DWITH_OPENCL:BOOL=FALSE ^
--DEMGU_ENABLE_SSE:BOOL=FALSE ^
--DENABLE_WINRT_MODE:BOOL=TRUE 
+-DEMGU_ENABLE_SSE:BOOL=FALSE 
 GOTO RUN_CMAKE
 
 @echo on