minor changes to raycasting

nci · Apr 9, 2020 · 61c8135 · 61c8135
1 parent 9a67eb1
commit 61c8135
Show file tree

Hide file tree

Showing 25 changed files with 2,478 additions and 3,655 deletions.
diff --git a/drishti.pri b/drishti.pri
@@ -13,31 +13,26 @@ contains(Windows_Setup, Win64) {
     message(Win64 setup)
 
     contains(DRISHTI_DEFINES, RENDERER) {
-      INCLUDEPATH += c:\Qt\libQGLViewer-2.6.1 \
+      INCLUDEPATH += c:\Qt\libQGLViewer\libQGLViewer-2.6.4 \
   	c:\cygwin64\home\acl900\drishtilib\freeglut\include \
- 	c:\cygwin64\home\acl900\drishtilib\glew-1.11.0\include
+ 	c:\cygwin64\home\acl900\drishtilib\glew-2.1.0\include
 
-      QMAKE_LIBDIR += c:\Qt\libQGLViewer-2.6.1\lib \
+      QMAKE_LIBDIR += c:\Qt\libQGLViewer\libQGLViewer-2.6.4\lib \
   	c:\cygwin64\home\acl900\drishtilib\freeglut\lib\x64 \
-	c:\cygwin64\home\acl900\drishtilib\glew-1.11.0\lib\Release\x64
+	c:\cygwin64\home\acl900\drishtilib\glew-2.1.0\build\lib\Release
     }
 
-    contains(DRISHTI_DEFINES, IMPORT) {
-      INCLUDEPATH += c:\cygwin64\home\acl900\drishtilib\netcdf\include
-      QMAKE_LIBDIR += c:\cygwin64\home\acl900\drishtilib\netcdf\lib \
-    }
-
     contains(DRISHTI_DEFINES, NETCDF) {
        INCLUDEPATH += c:\cygwin64\home\acl900\drishtilib\netcdf\include
        QMAKE_LIBDIR += c:\cygwin64\home\acl900\drishtilib\netcdf\lib \
     }  
 
     contains(DRISHTI_DEFINES, ITK) {
-      ITKVer = 4.3
-      InsightToolkit = D:\InsightToolkit-$${ITKVer}.1
-      ITK = D:\ITK
+      ITKVer = 5.0
+      InsightToolkit = C:\InsightToolkit-$${ITKVer}.1
+      ITK = C:\ITK
 
-      QMAKE_LIBDIR += d:\ITK\lib\Release
+      QMAKE_LIBDIR += C:\ITK\lib\Release
     }
   }
 }

diff --git a/drishti/drishti.pro b/drishti/drishti.pro
@@ -40,16 +40,6 @@ include( ../drishti.pri )
 win32 {
   DEFINES += USE_GLMEDIA
 
- contains(Windows_Setup, Win32) {
-    message(drishti.exe : Win32 setup)
-    INCLUDEPATH += ..\glmedia 16bit
-    QMAKE_LIBDIR += ..\glmedia
-    LIBS += QGLViewer2.lib \
-  	netcdf.lib \
-  	glew32.lib \
-  	glmedia.lib
-  }
-
   contains(Windows_Setup, Win64) {
     message(drishti.exe : Win64 setup)
     DEFINES += _CRT_SECURE_NO_WARNINGS
@@ -59,7 +49,9 @@ win32 {
   	netcdfcpp.lib \
   	glew32.lib \
   	freeglut.lib \
-  	glmedia.lib
+  	glmedia.lib \
+        opengl32.lib \
+        glu32.lib
   }
 }
 

diff --git a/drishti/mopplugin/mopplugin.pro b/drishti/mopplugin/mopplugin.pro
diff --git a/drishti/plugins/common/common.pro b/drishti/plugins/common/common.pro
@@ -14,15 +14,6 @@ FORMS += ../../propertyeditor.ui
 win32 {
   DESTDIR = ../common
 
- contains(Windows_Setup, Win32) {
-  INCLUDEPATH += ../../  ..\..\..\glmedia
-  QMAKE_LIBDIR += ..\..\..\glmedia
-  LIBS += QGLViewer2.lib \
-	  netcdf.lib \
-	  glew32.lib \
-	  glmedia.lib
- }
-
  contains(Windows_Setup, Win64) {
   message(drishti.exe : Win64 setup)
   DEFINES += _CRT_SECURE_NO_WARNINGS