Added option to build windows ARM binary with NEON.

platforms/windows/Build_Binary_x86.bat

@@ -344,38 +344,7 @@ SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% ^
 
 :END_PERFORMANCE_TEST
 
-IF "%1%"=="arm" GOTO WITH_ARM
-IF "%1%"=="arm64" GOTO WITH_ARM
-GOTO END_WITH_ARM
 
-:WITHOUT_ARM
-SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% -DEMGU_ENABLE_SSE:BOOL=TRUE 
-
-IF "%BUILD_TYPE%"=="COMMERCIAL" GOTO CONFIGURE_COMMERCIAL
-GOTO CONFIGURE_OPENSOURCE
-:CONFIGURE_COMMERCIAL
-SET IPP_BUILD_FLAGS=-DWITH_IPP:BOOL=TRUE
-SET CPU_DISPATCH_FLAGS=-DCPU_DISPATCH:STRING=SSE4_1;SSE4_2;AVX;AVX2
-GOTO END_CONFIG_COMMERCIAL_OR_OPENSOURCE
-:CONFIGURE_OPENSOURCE
-SET IPP_BUILD_FLAGS=-DWITH_IPP:BOOL=FALSE 
-SET CPU_DISPATCH_FLAGS=-DCPU_DISPATCH:STRING=""
-:END_CONFIG_COMMERCIAL_OR_OPENSOURCE
-SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% %IPP_BUILD_FLAGS% %CPU_DISPATCH_FLAGS%
-
-GOTO END_WITH_ARM
-
-:WITH_ARM
-SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% ^
--DCV_ENABLE_INTRINSICS:BOOL=FALSE ^
--DEMGU_ENABLE_SSE:BOOL=FALSE ^
--DCPU_BASELINE:STRING="" ^
--DCPU_DISPATCH:STRING="" ^
--DWITH_IPP:BOOL=OFF ^
--DEMGU_CV_WITH_FREETYPE:BOOL=OFF ^
--DBUILD_opencv_freetype:BOOL=OFF
-
-:END_WITH_ARM
 
 IF NOT "%4%"=="openni" GOTO END_OF_OPENNI
 :WITH_OPENNI
@@ -646,7 +615,7 @@ SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% ^
 -DWITH_OPENCL:BOOL=TRUE ^
 -DWITH_MSMF:BOOL=TRUE
 
-GOTO RUN_CMAKE
+GOTO CONFIG_ARM
 
 :VISUAL_STUDIO
 
@@ -658,7 +627,7 @@ REM Windows Desktop Build
 SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% ^
 -DWITH_OPENCL:BOOL=TRUE ^
 -DWITH_MSMF:BOOL=TRUE
-GOTO RUN_CMAKE
+GOTO CONFIG_ARM
 
 :CONFIGURE_WINDOWS_STORE_10
 SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% ^
@@ -678,6 +647,55 @@ SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% ^
 -DEigen3_DIR:STRING=%EIGEN_DIR% ^
 -DEMGU_ENABLE_SSE:BOOL=FALSE 
 
+:CONFIG_ARM
+
+IF "%1%"=="arm" GOTO WITH_ARM
+IF "%1%"=="arm64" GOTO WITH_ARM
+GOTO END_WITH_ARM
+
+:WITHOUT_ARM
+SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% -DEMGU_ENABLE_SSE:BOOL=TRUE 
+
+IF "%BUILD_TYPE%"=="COMMERCIAL" GOTO CONFIGURE_COMMERCIAL
+GOTO CONFIGURE_OPENSOURCE
+:CONFIGURE_COMMERCIAL
+SET IPP_BUILD_FLAGS=-DWITH_IPP:BOOL=TRUE
+SET CPU_DISPATCH_FLAGS=-DCPU_DISPATCH:STRING=SSE4_1;SSE4_2;AVX;AVX2
+GOTO END_CONFIG_COMMERCIAL_OR_OPENSOURCE
+:CONFIGURE_OPENSOURCE
+SET IPP_BUILD_FLAGS=-DWITH_IPP:BOOL=FALSE 
+SET CPU_DISPATCH_FLAGS=-DCPU_DISPATCH:STRING=""
+:END_CONFIG_COMMERCIAL_OR_OPENSOURCE
+SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% %IPP_BUILD_FLAGS% %CPU_DISPATCH_FLAGS%
+
+GOTO END_WITH_ARM
+
+:WITH_ARM
+IF "%BUILD_TYPE%"=="COMMERCIAL" GOTO CONFIGURE_COMMERCIAL_ARM
+GOTO CONFIGURE_OPENSOURCE_ARM
+:CONFIGURE_COMMERCIAL_ARM
+SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% ^
+-DCV_ENABLE_INTRINSICS:BOOL=ON ^
+-DCPU_BASELINE:STRING="NEON" ^
+-DCPU_DISPATCH:STRING=""
+
+GOTO END_CONFIG_COMMERCIAL_OR_OPENSOURCE_ARM
+:CONFIGURE_OPENSOURCE_ARM
+SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% ^
+-DCV_ENABLE_INTRINSICS:BOOL=OFF ^
+-DCPU_BASELINE:STRING="" ^
+-DCPU_DISPATCH:STRING=""
+
+:END_CONFIG_COMMERCIAL_OR_OPENSOURCE_ARM
+
+SET EMGU_CV_CMAKE_CONFIG_FLAGS=%EMGU_CV_CMAKE_CONFIG_FLAGS% ^
+-DEMGU_ENABLE_SSE:BOOL=FALSE ^
+-DWITH_IPP:BOOL=OFF ^
+-DEMGU_CV_WITH_FREETYPE:BOOL=OFF ^
+-DBUILD_opencv_freetype:BOOL=OFF
+
+:END_WITH_ARM
+
 
 :RUN_CMAKE
 @echo on