diff --git a/console.bat b/console.bat index ca5a3f83..6d741f83 100644 --- a/console.bat +++ b/console.bat @@ -3,6 +3,6 @@ setlocal call win32env.bat -start "ODM Console" cmd "/k venv\Scripts\activate" +start "ODM Console" cmd endlocal diff --git a/requirements.txt b/requirements.txt index 25f718bb..a6d66a49 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ cloudpickle==1.6.0 edt==2.0.2 ExifRead==2.3.2 Fiona==1.8.17 ; sys_platform == 'linux' or sys_platform == 'darwin' -https://download.lfd.uci.edu/pythonlibs/w4tscw6k/Fiona-1.8.19-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' +https://github.com/OpenDroneMap/windows-deps/raw/main/Fiona-1.8.19-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' joblib==0.17.0 laspy==1.7.0 lxml==4.6.1 @@ -20,8 +20,8 @@ Pysolar==0.9 pytz==2020.4 PyYAML==5.1 rasterio==1.1.8 ; sys_platform == 'linux' or sys_platform == 'darwin' -https://download.lfd.uci.edu/pythonlibs/w4tscw6k/rasterio-1.2.3-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' -https://download.lfd.uci.edu/pythonlibs/w4tscw6k/GDAL-3.2.2-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' +https://github.com/OpenDroneMap/windows-deps/raw/main/rasterio-1.2.3-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' +https://github.com/OpenDroneMap/windows-deps/raw/main/GDAL-3.2.3-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' repoze.lru==0.7 scikit-learn==0.23.2 scikit-image==0.17.2 diff --git a/run.bat b/run.bat index 276347f0..7b014395 100644 --- a/run.bat +++ b/run.bat @@ -3,8 +3,6 @@ setlocal call win32env.bat -call %ODMBASE%\venv\Scripts\activate - python "%ODMBASE%\run.py" %* endlocal diff --git a/vcpkg-requirements.txt b/vcpkg-requirements.txt index 48fe4a17..1e3374e9 100644 --- a/vcpkg-requirements.txt +++ b/vcpkg-requirements.txt @@ -1,22 +1,24 @@ -eigen3 -suitesparse -lapack -tbb -zlib -libpng -libjpeg-turbo -tiff -flann -boost-filesystem -boost-date-time -boost-iostreams -boost-foreach -boost-signals2 -boost-interprocess -boost-graph -boost-asio -boost-program-options -libgeotiff -cgal - +eigen3:x64-windows +suitesparse:x64-windows +lapack:x64-windows +tbb:x64-windows +glog:x64-windows +curl:x64-windows +libxml2:x64-windows +zlib:x64-windows +libpng:x64-windows +libjpeg-turbo:x64-windows +tiff:x64-windows +flann:x64-windows +boost-filesystem:x64-windows +boost-date-time:x64-windows +boost-iostreams:x64-windows +boost-foreach:x64-windows +boost-signals2:x64-windows +boost-interprocess:x64-windows +boost-graph:x64-windows +boost-asio:x64-windows +boost-program-options:x64-windows +libgeotiff:x64-windows +cgal:x64-windows yasm-tool:x86-windows \ No newline at end of file diff --git a/win32env.bat b/win32env.bat index d9af62b0..e56debff 100644 --- a/win32env.bat +++ b/win32env.bat @@ -4,3 +4,4 @@ set OSFMBASE=%ODMBASE%SuperBuild\install\bin\opensfm\bin set PATH=%GDALBASE%;%ODMBASE%SuperBuild\install\bin;%OSFMBASE% set PROJ_LIB=%GDALBASE%\data\proj +call venv\Scripts\activate \ No newline at end of file