Blob Blame History Raw
diff -rupN enGits-engrid-e6d55f5/src/engrid.pro enGits-engrid-e6d55f5-new/src/engrid.pro
--- enGits-engrid-e6d55f5/src/engrid.pro	2014-03-10 09:48:24.000000000 +0100
+++ enGits-engrid-e6d55f5-new/src/engrid.pro	2014-07-30 19:09:04.584948072 +0200
@@ -6,19 +6,10 @@ CONFIG   += ordered recursive
 
 CONFIG += debug_and_release
 
-debian {
-  SUBDIRS   =
-}
-else {
-  SUBDIRS   = netgen
-}
-
 SUBDIRS  += libengrid
 SUBDIRS  += engrid
 
-netgen.file = netgen_svn/ng.pro
 libengrid.file    = libengrid/libengrid.pro
-libengrid.depends = netgen
 
 engrid.file    = engrid.pro.app
 engrid.depends = libengrid 
diff -rupN enGits-engrid-e6d55f5/src/engrid.pro.app enGits-engrid-e6d55f5-new/src/engrid.pro.app
--- enGits-engrid-e6d55f5/src/engrid.pro.app	2014-03-10 09:48:24.000000000 +0100
+++ enGits-engrid-e6d55f5-new/src/engrid.pro.app	2014-07-30 19:10:16.358944883 +0200
@@ -46,11 +46,12 @@ win32-msvc* {
     LIBS        += ../../netCDF/lib/netcdfcxx.lib
   }
 } else {
+  CONFIG          += link_pkgconfig
   QMAKE_CXXFLAGS += -Wno-deprecated -g
   INCLUDEPATH     += $(VTKINCDIR)
   LIBS            += -L$(VTKLIBDIR)
-  LIBS            += -L./netgen_svn -lng
   LIBS            += -L./libengrid -lengrid
+  PKGCONFIG       += netgen-mesher
   brlcad {
     INCLUDEPATH += $(BRLCADINCDIR)
     INCLUDEPATH += $(BRLCADINCDIR)/openNURBS
@@ -98,8 +99,6 @@ greaterThan(VTK_MAJOR_VERSION, 5) {
 INCLUDEPATH += ./libengrid
 INCLUDEPATH += ./libengrid-build
 INCLUDEPATH += ../engrid-build
-INCLUDEPATH += ./netgen_svn/netgen-mesher/netgen/nglib
-INCLUDEPATH += ./netgen_svn/netgen-mesher/netgen/libsrc/general
 
 OTHER_FILES += checkcomments.py todo.txt
 RESOURCES   += libengrid/engrid.qrc
diff -rupN enGits-engrid-e6d55f5/src/libengrid/libengrid.pro enGits-engrid-e6d55f5-new/src/libengrid/libengrid.pro
--- enGits-engrid-e6d55f5/src/libengrid/libengrid.pro	2014-03-10 09:48:24.000000000 +0100
+++ enGits-engrid-e6d55f5-new/src/libengrid/libengrid.pro	2014-07-31 00:45:36.508574454 +0200
@@ -5,7 +5,7 @@ LANGUAGE = C++
 TARGET   = engrid
 
 CONFIG += qt debug_and_release thread
-QT     += xml network opengl`
+QT     += xml opengl`
 
 win32-msvc* {
   CONFIG += staticlib
@@ -46,8 +46,21 @@ win32-msvc* {
     LIBS        += ../../../netCDF/lib/netcdfcxx.lib
   }
 } else {
+  CONFIG          += link_pkgconfig
   QMAKE_CXXFLAGS  += -Wno-deprecated -g
   INCLUDEPATH     += $(VTKINCDIR)
+  LIBS            += -L$(VTKLIBDIR)
+  LIBS            += -lvtkCommonCore
+  LIBS            += -lvtkCommonExecutionModel
+  LIBS            += -lvtkGUISupportQt
+  LIBS            += -lvtkInteractionStyle
+  LIBS            += -lvtkIOLegacy
+  LIBS            += -lvtkIOPLY
+  LIBS            += -lvtkIOXML
+  LIBS            += -lvtkRenderingAnnotation
+  LIBS            += -lvtkRenderingCore
+  LIBS            += -lvtkRenderingFreeTypeOpenGL
+  PKGCONFIG       += netgen-mesher
   brlcad {
     INCLUDEPATH += $(BRLCADINCDIR)
     INCLUDEPATH += $(BRLCADINCDIR)/openNURBS
@@ -55,14 +68,13 @@ win32-msvc* {
   }
   netcdf {
     DEFINES     += TAU_SUPPORT
+    LIBS        += -lnetcdf_c++
   }
 }
 
 
 INCLUDEPATH += ..
 INCLUDEPATH += ./libengrid
-INCLUDEPATH += ../netgen_svn/netgen-mesher/netgen/nglib
-INCLUDEPATH += ../netgen_svn/netgen-mesher/netgen/libsrc/general
 
 # VTK
 
diff -rupN enGits-engrid-e6d55f5/src/misc/engrid-standard.pri enGits-engrid-e6d55f5-new/src/misc/engrid-standard.pri
--- enGits-engrid-e6d55f5/src/misc/engrid-standard.pri	2014-03-10 09:48:24.000000000 +0100
+++ enGits-engrid-e6d55f5-new/src/misc/engrid-standard.pri	2014-07-31 00:19:33.365643915 +0200
@@ -5,7 +5,7 @@ TARGET = engrid
 CONFIG         += qt debug_and_release thread
 
 QMAKE_CXXFLAGS += -Wall
-QT             += xml network opengl
+QT             += xml opengl
 QMAKE_CXXFLAGS += -Wno-deprecated
 
 LIBS += -lm