Updates for win build libgui is almost building - there are a few vta…

…ble errors left. In order to get past cyclical dependency issues I am building raster, gui and composer files into a single lib.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5983 c8812cc2-4d05-0410-92ff-de0c093fc19c

settings.pro

@@ -160,7 +160,6 @@ macx:LIBS+=-L/usr/local/lib
 #
 #################################################################
 
-win32:INCLUDEPATH += c:/msys/local/include
 INCLUDEPATH +=$${WORKDIR}/src \
               $${WORKDIR}/src/core \
               $${WORKDIR}/src/gui \
@@ -180,10 +179,8 @@ INCLUDEPATH +=$${WORKDIR}/src \
 
 win32{
   message(Installing for windows!)
-  INCLUDEPATH += . 
-  INCLUDEPATH += C:/MinGW/include
-  INCLUDEPATH += C:/cygwin/usr/local/src/om/src
-  INCLUDEPATH += c:/dev/cpp/om/src
+  #add any win specific rules here 
+  INCLUDEPATH += c:/msys/local/include
 }
 
 
@@ -194,7 +191,6 @@ win32{
 #################################################################
 
 macx{
-  INCLUDEPATH += /usr/local/include/openmodeller
   #fixme should not need the next line
   #INCLUDEPATH += /Users/timsutton/dev/cpp/om/src
   FRAMEWORKSDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/Frameworks

src/composer/composer.pro

@@ -29,10 +29,10 @@ message("LIBS: $${LIBS}")
 DESTDIR=$${QGISLIBDIR}
 #leave the next line here - it clears the Qt defines
 QT =
-QT += qt3support svg core gui
+QT += qt3support svg core gui xml
 message("Building libs into $${DESTDIR}")
 
-libqgis_composerHEADERS = qgscomposer.h \
+HEADERS = qgscomposer.h \
 		qgscomposeritem.h	\
 		qgscomposerlabel.h	\
 		qgscomposerpicture.h	\
@@ -42,7 +42,7 @@ libqgis_composerHEADERS = qgscomposer.h \
 		qgscomposerview.h	\
 		qgscomposition.h					
 
-libqgis_composer_la_SOURCES =  qgscomposer.cpp \
+SOURCES =  qgscomposer.cpp \
 		qgscomposeritem.cpp	       \
 		qgscomposerlabel.cpp	       \
 		qgscomposerpicture.cpp	       \