r16198 by jghali - msvc project update + win32 build fix

[scribus-commit]

Author: jghali
Date: Sat Jan  1 23:40:04 2011
New Revision: 16198

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16198
Log:
msvc project update + win32 build fix

Modified:
    trunk/Scribus/scribus/pageitem_regularpolygon.cpp
    trunk/Scribus/win32/vc8/Scribus-build.vsprops
    trunk/Scribus/win32/vc8/Scribus.vcproj

Modified: trunk/Scribus/scribus/pageitem_regularpolygon.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16198&path=/trunk/Scribus/scribus/pageitem_regularpolygon.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_regularpolygon.cpp (original)
+++ trunk/Scribus/scribus/pageitem_regularpolygon.cpp Sat Jan  1 23:40:04 2011
@@ -21,6 +21,9 @@
  *                                                                         *
  ***************************************************************************/
 
+#if defined(_MSC_VER)
+#define _USE_MATH_DEFINES
+#endif
 #include <cmath>
 #include <cassert>
 

Modified: trunk/Scribus/win32/vc8/Scribus-build.vsprops
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16198&path=/trunk/Scribus/win32/vc8/Scribus-build.vsprops
==============================================================================
--- trunk/Scribus/win32/vc8/Scribus-build.vsprops (original)
+++ trunk/Scribus/win32/vc8/Scribus-build.vsprops Sat Jan  1 23:40:04 2011
@@ -6,50 +6,62 @@
 	>
 	<UserMacro
 		Name="QT4_DIR"
-		Value="E:\Libs-msvc2005\qt-4.6.1"
+		Value="D:\Libraries-vc8\qt-4.6.3"
 	/>
 	<UserMacro
 		Name="BOOST_DIR"
-		Value="E:\Libs-msvc2005\boost-1.35.0"
+		Value="E:\Libraries-vc8\boost-1.35.0"
 	/>
 	<UserMacro
 		Name="CAIRO_DIR"
-		Value="E:\Libs-msvc2005\cairo-1.8.8"
+		Value="E:\Libraries-vc8\cairo-1.8.8"
 	/>
 	<UserMacro
 		Name="FREETYPE_DIR"
-		Value="E:\Libs-msvc2005\freetype-2.3.12"
+		Value="E:\Libraries-vc8\freetype-2.4.2"
 	/>
 	<UserMacro
 		Name="ICONV_DIR"
-		Value="E:\Libs-msvc2005\iconv-1.9.2"
+		Value="E:\Libraries-vc8\iconv-1.9.2"
 	/>
 	<UserMacro
 		Name="LCMS_DIR"
-		Value="E:\Libs-msvc2005\lcms-2.0"
+		Value="E:\Libraries-vc8\lcms-2.0"
 	/>
 	<UserMacro
 		Name="LIBJPEG_DIR"
-		Value="E:\Libs-msvc2005\libjpeg-6b-3"
+		Value="E:\Libraries-vc8\libjpeg-6b-3"
 	/>
 	<UserMacro
 		Name="LIBTIFF_DIR"
-		Value="E:\Libs-msvc2005\libtiff-3.8.2"
+		Value="E:\Libraries-vc8\libtiff-3.8.2"
 	/>
 	<UserMacro
 		Name="PIXMAN_DIR"
-		Value="E:\Libs-msvc2005\pixman-0.18.0"
+		Value="E:\Libraries-vc8\pixman-0.18.0"
 	/>
 	<UserMacro
 		Name="PODOFO_DIR"
-		Value="E:\Libs-msvc2005\podofo-0.8.0"
+		Value="E:\Libraries-vc8\podofo-0.8.2"
+	/>
+	<UserMacro
+		Name="LIBWPD_DIR"
+		Value="E:\Libraries-vc8\libwpd-0.8.14"
+	/>
+	<UserMacro
+		Name="LIBWPG_DIR"
+		Value="E:\Libraries-vc8\libwpg-0.1.3"
 	/>
 	<UserMacro
 		Name="LIBXML2_DIR"
-		Value="E:\Libs-msvc2005\libxml2-2.6.32+"
+		Value="E:\Libraries-vc8\libxml2-2.6.32+"
+	/>
+	<UserMacro
+		Name="OPENSCENEGRAPH_DIR"
+		Value="E:\Libraries-vc8\OpenSceneGraph-2.8.1"
 	/>
 	<UserMacro
 		Name="PYTHON_DIR"
-		Value="E:\Libs-msvc2005\Python-2.5.4"
+		Value="E:\Libraries-vc8\Python-2.5.4"
 	/>
 </VisualStudioPropertySheet>

Modified: trunk/Scribus/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16198&path=/trunk/Scribus/win32/vc8/Scribus.vcproj
==============================================================================
--- trunk/Scribus/win32/vc8/Scribus.vcproj (original)
+++ trunk/Scribus/win32/vc8/Scribus.vcproj Sat Jan  1 23:40:04 2011
@@ -1219,6 +1219,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\pageitem_regularpolygon.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\pageitem_symbol.cpp"
 				>
 			</File>
@@ -6264,6 +6268,38 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\scribus\pageitem_regularpolygon.h"
+				>
+				<FileConfiguration
+					Name="Debug-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug-arthur|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-arthur|Win32"
+					>
+					<Tool
+						Name="moc.exe"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\scribus\pageitem_symbol.h"
 				>
 				<FileConfiguration
@@ -11894,6 +11930,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\scribus\moc_pageitem_regularpolygon.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\scribus\moc_pageitem_symbol.cpp"
 				>
 			</File>