change qmake.bat nmake_release.bat from vs2010qt474 to vs2013qt486

Vaa3D · Jan 7, 2020 · 32f63be · 32f63be
1 parent 3cc7823
commit 32f63be
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/nmake_release.bat b/nmake_release.bat
@@ -1,8 +1,10 @@
 :: 2018-04-27 RZC
 :: a convenience script for MSVC nmake
+::
 
 cd v3d_main\common_lib\winlib64
-copy /y libnewmat_VS2010.lib libnewmat.lib
+::copy /y libnewmat_VS2010.lib libnewmat.lib
+copy /y libnewmat_VS2013.lib libnewmat.lib
 cd ..\..\..
 
 cd v3d_main\v3d

diff --git a/qmake.bat b/qmake.bat
@@ -1,3 +1,7 @@
-set QT_BIN=C:\Qt\vs2010x64-qt-4.7.4\bin
+:: a warpper for qmake to switch QT version 
+::
+
+::set QT_BIN=C:\Qt\vs2010x64-qt-4.7.4\bin
+set QT_BIN=C:\Qt\vs2013x64-qt-4.8.6\bin
 
 %QT_BIN%\qmake.exe %*
diff --git a/v3d_main/terafly/src/terarepo b/v3d_main/terafly/src/terarepo
+4 −0		LICENSE.txt
+4 −0		LICENSE_APPLE.txt
+13 −6		README.md
+8 −1		cmake/InstallLocation.cmake
+2 −2		cmake/Version.cmake
+208 −18		src/crossmips/compute_funcs.cpp
+57 −9		src/crossmips/compute_funcs.h
+1 −0		src/gui/CMergeTiles.cpp
+2 −2		src/imagemanager/MappedVolume.cpp
+8 −8		src/imagemanager/RawFmtMngr.cpp
+2 −1		src/imagemanager/SimpleVolume.cpp
+2 −1		src/imagemanager/SimpleVolumeRaw.cpp
+2 −1		src/imagemanager/StackedVolume.cpp
+1 −0		src/imagemanager/TiledMCVolume.cpp
+3 −2		src/imagemanager/TiledMCVolume.h
+32 −20		src/imagemanager/TiledVolume.cpp
+1 −0		src/imagemanager/TimeSeries.cpp
+3 −2		src/imagemanager/TimeSeries.h
+3 −2		src/imagemanager/VirtualVolume.cpp
+2 −1		src/imagemanager/VirtualVolume.h
+27 −0		src/iomanager/IOPluginAPI.h
+76 −11		src/iomanager/plugins/IMS_HDF5/IMS_HDF5.cpp
+22 −4		src/iomanager/plugins/dcimg/dcimg.cpp
+8 −0		src/iomanager/plugins/exampleplugin2D/exampleplugin2D.cpp
+11 −2		src/iomanager/plugins/opencv2D/opencv2D.cpp
+12 −3		src/iomanager/plugins/tiff2D/tiff2D.cpp
+9 −0		src/iomanager/plugins/tiff3D/tiff3D.cpp
+45 −2		src/ui/CLI.cpp
+11 −0		src/ui/CLI.h
+57 −1		src/ui/main.cpp
+1,729 −0		src/utils/pyscripts/Parastitcher.py
+2 −0		src/utils/pyscripts/README.txt
+5 −0		src/utils/teraconverter/TemplateCLI.cpp
+7 −5		src/utils/teraconverter/TemplateCLI.h
+2 −0		src/utils/teraconverter/teraconverter.cpp
+113 −74		src/utils/volumeconverter/VolumeConverter.cpp
+5 −3		src/utils/volumeconverter/VolumeConverter.h
+21 −5		src/volumemanager/vmBlockVolume.cpp
+2 −1		src/volumemanager/vmBlockVolume.h
+3 −3		src/volumemanager/vmStack.cpp
+22 −4		src/volumemanager/vmStackedVolume.cpp
+2 −1		src/volumemanager/vmStackedVolume.h
+8 −0		src/volumemanager/vmVirtualVolume.h