Updating PRO files after Win32 integration

diff --git a/src/Common.pro b/src/Common.pro
index 904f305f4aa33cf13ecddc0a61160868a515bf9c..90262dcff83532fc72a29a748d37ed46ce18c03f 100644 (file)
--- a/src/Common.pro
+++ b/src/Common.pro
@@ -14,27 +14,28 @@ isEmpty( HEADERS ):HEADERS = *.h
 isEmpty( SOURCES ):SOURCES = *.cxx
 
 MOC_DIR = ../../moc
-OBJECTS_DIR = ../../$$(CONFIG_ID)/$$(CONFIG_MODE)/obj/$$TARGET
 
 unix {
+  OBJECTS_DIR = ../../$$(CONFIG_ID)/obj
   contains( TEMPLATE, lib ) {
     DESTDIR = ../../$(CONFIG_ID)/lib
   } else {
     DESTDIR = ../../$(CONFIG_ID)/bin
   }
 
-  INCLUDEPATH += ../../include
+  INCLUDEPATH += ../../$(CONFIG_ID)/include
   LIBS += -L../../$(CONFIG_ID)/lib
 
-  GUIResources = ../../resources
+  GUIResources = ../../$(CONFIG_ID)/resources
 
   includes.files = $$HEADERS
-  includes.path = ../../include
+  includes.path = ../../$(CONFIG_ID)/include
 
   INSTALLS += includes
 }
 
 win32 {
+  OBJECTS_DIR = ../../$$(CONFIG_ID)/$$(CONFIG_MODE)/obj/$$TARGET
   contains( TEMPLATE, vclib ) {
     DESTDIR = $$(SUIT_DIR)/$$(CONFIG_ID)/lib/$$(CONFIG_MODE)
   } else {

diff --git a/src/Resources.pro b/src/Resources.pro
index 44991589745b10e09fd7c2ea9b2dee016cf5cfe5..50b39ef31851d957ba50f7f61de76eed55269a38 100755 (executable)
--- a/src/Resources.pro
+++ b/src/Resources.pro
@@ -10,6 +10,6 @@ win32:copy_res.input = Resource
 win32:QMAKE_EXTRA_COMPILERS += copy_res
 
 resources.files = $$RES_FILES
-resources.path = ../../resources
+resources.path = $${GUIResources}/resources
 
 INSTALLS += resources

diff --git a/src/VTKViewer/VTKViewer.pro b/src/VTKViewer/VTKViewer.pro
index e5fa8bf25ee21a87da8dfa3ac403618d4aee5713..e8d028f353454447c5494f90ff3d4baa7dd29221 100644 (file)
--- a/src/VTKViewer/VTKViewer.pro
+++ b/src/VTKViewer/VTKViewer.pro
@@ -18,7 +18,5 @@ win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml
 win32:DEFINES += WNT WIN32 
 DEFINES += VTKVIEWER_EXPORTS $(CASDEFINES) OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS
 
-unix:message ( "Sources: $$SOURCES " )
-
 include(../Translations.pro)
 include(../Resources.pro)