Browse Source

Enable building for ARM64. Removed windows store 81 build scripts.

pull/275/head
Canming Huang 6 years ago
parent
commit
fc24b220d6
  1. 2
      opencv
  2. 2
      opencv_contrib
  3. 1
      platforms/windows/Build_Binary_arm64_windows_store10.bat
  4. 1
      platforms/windows/Build_Binary_arm_windows_phone81_device.bat
  5. 1
      platforms/windows/Build_Binary_x86-64_windows_store81.bat
  6. 10
      platforms/windows/Build_Binary_x86.bat
  7. 1
      platforms/windows/Build_Binary_x86_windows_phone81_emulator.bat
  8. 1
      platforms/windows/Build_Binary_x86_windows_store81.bat

2
opencv

@ -1 +1 @@
Subproject commit f84a149ac22f48011592079470e79afd4a97fb0a
Subproject commit fefb54b88b8c0be6af401602bdc2cbcf7a0e01bf

2
opencv_contrib

@ -1 +1 @@
Subproject commit 50bee7f0f50ab648ddda703535f654fadd4f5bed
Subproject commit fbed32b066fdfa937b9756b9eec86fcd6636d4d1

1
platforms/windows/Build_Binary_arm64_windows_store10.bat

@ -0,0 +1 @@
call Build_Binary_x86.bat ARM64 nogpu WindowsStore10

1
platforms/windows/Build_Binary_arm_windows_phone81_device.bat

@ -1 +0,0 @@
call Build_Binary_x86.bat ARM nogpu WindowsPhone81

1
platforms/windows/Build_Binary_x86-64_windows_store81.bat

@ -1 +0,0 @@
call Build_Binary_x86.bat 64 nogpu WindowsStore81

10
platforms/windows/Build_Binary_x86.bat

@ -17,8 +17,9 @@ mkdir b
cd b
REM cd ..\..
IF "%1%"=="64" ECHO "BUILDING 64bit solution"
IF "%1%"=="ARM" ECHO "BUILDING ARM solution"
IF "%1%"=="32" ECHO "BUILDING 32bit solution"
IF "%1%"=="ARM" ECHO "BUILDING ARM solution"
IF "%1%"=="ARM64" ECHO "BUILDING ARM64 solution"
SET NETFX_CORE=""
IF "%3%"=="WindowsPhone81" SET NETFX_CORE="TRUE"
@ -28,6 +29,7 @@ IF "%3%"=="WindowsStore10" SET NETFX_CORE="TRUE"
SET OS_MODE=
IF "%1%"=="64" SET OS_MODE= Win64
IF "%1%"=="ARM" SET OS_MODE= ARM
IF "%1%"=="ARM64" SET OS_MODE= ARM64
SET PROGRAMFILES_DIR_X86=%programfiles(x86)%
if NOT EXIST "%PROGRAMFILES_DIR_X86%" SET PROGRAMFILES_DIR_X86=%programfiles%
@ -117,6 +119,7 @@ IF %DEVENV%==%VS2017% SET CMAKE_CONF="Visual Studio 15%OS_MODE%"
IF %DEVENV%==%VS2019% IF "%1%"=="64" SET CMAKE_CONF="Visual Studio 16" -A x64
IF %DEVENV%==%VS2019% IF "%1%"=="32" SET CMAKE_CONF="Visual Studio 16" -A Win32
IF %DEVENV%==%VS2019% IF "%1%"=="ARM" SET CMAKE_CONF="Visual Studio 16" -A ARM
IF %DEVENV%==%VS2019% IF "%1%"=="ARM64" SET CMAKE_CONF="Visual Studio 16" -A ARM64
SET IPP_BUILD_FLAGS=-DWITH_IPP:BOOL=FALSE
@ -175,6 +178,11 @@ SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% ^
:END_PERFORMANCE_TEST
IF NOT "%1%"=="ARM64" GOTO END_WITH_ARM64
:WITH_ARM64
SET CMAKE_CONF_FLAGS=%CMAKE_CONF_FLAGS% -DCV_ENABLE_INTRINSICS:BOOL=FALSE
:END_WITH_ARM64
IF NOT "%4%"=="openni" GOTO END_OF_OPENNI
:WITH_OPENNI
SET OPENNI_LIB_DIR=%OPEN_NI_LIB%

1
platforms/windows/Build_Binary_x86_windows_phone81_emulator.bat

@ -1 +0,0 @@
call Build_Binary_x86.bat 32 nogpu WindowsPhone81

1
platforms/windows/Build_Binary_x86_windows_store81.bat

@ -1 +0,0 @@
call Build_Binary_x86.bat 32 nogpu WindowsStore81
Loading…
Cancel
Save