msvc project update : more modifications to ease transition to msvc 2010/msvc 2012

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17538 11d20701-8431-0410-a711-e3c959e3b870

13 files changed, 15 insertions, 13 deletions

diff --git a/scribus/canvas.cpp b/scribus/canvas.cpp
index 6156c0d..e3c5d47 100644
--- a/scribus/canvas.cpp
+++ b/scribus/canvas.cpp
@@ -13,7 +13,7 @@
 *                                                                         *
 ***************************************************************************/
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 #include <cmath>
diff --git a/scribus/canvasgesture_resize.cpp b/scribus/canvasgesture_resize.cpp
index 18a2280..0b132e0 100644
--- a/scribus/canvasgesture_resize.cpp
+++ b/scribus/canvasgesture_resize.cpp
@@ -13,7 +13,7 @@
 *                                                                         *

 ***************************************************************************/

 

-#if defined(_MSC_VER)

+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)

 #define _USE_MATH_DEFINES

 #endif

 #include <cmath>

diff --git a/scribus/fpointarray.cpp b/scribus/fpointarray.cpp
index f1c3acb..6ea5bcc 100644
--- a/scribus/fpointarray.cpp
+++ b/scribus/fpointarray.cpp
@@ -24,7 +24,7 @@ for which a new license (GPL+exception) is in place.
 #include "fpointarray.h"
 #include <cstdarg>
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 #include <cmath>
diff --git a/scribus/pageitem_line.cpp b/scribus/pageitem_line.cpp
index c7bfb19..4a35d67 100644
--- a/scribus/pageitem_line.cpp
+++ b/scribus/pageitem_line.cpp
@@ -21,7 +21,7 @@ for which a new license (GPL+exception) is in place.
  *                                                                         *
  ***************************************************************************/
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 #include <cmath>
diff --git a/scribus/pdflib_core.cpp b/scribus/pdflib_core.cpp
index ebb4651..d8ddf19 100644
--- a/scribus/pdflib_core.cpp
+++ b/scribus/pdflib_core.cpp
@@ -21,7 +21,7 @@ for which a new license (GPL+exception) is in place.
  *                                                                         *
  ***************************************************************************/
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 
diff --git a/scribus/plugins/colorwheel/colorwheelwidget.cpp b/scribus/plugins/colorwheel/colorwheelwidget.cpp
index ee6077d..26b97ea 100644
--- a/scribus/plugins/colorwheel/colorwheelwidget.cpp
+++ b/scribus/plugins/colorwheel/colorwheelwidget.cpp
@@ -7,7 +7,7 @@ for which a new license (GPL+exception) is in place.
 
 #include "colorwheelwidget.h"
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 #include <cmath>
diff --git a/scribus/plugins/import/xfig/importxfig.cpp b/scribus/plugins/import/xfig/importxfig.cpp
index 67fe20f..e6eb5b1 100644
--- a/scribus/plugins/import/xfig/importxfig.cpp
+++ b/scribus/plugins/import/xfig/importxfig.cpp
@@ -15,7 +15,7 @@ for which a new license (GPL+exception) is in place.
 #include <QStack>

 #include <QDebug>

 

-#if defined(_MSC_VER)

+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)

 #define _USE_MATH_DEFINES

 #endif

 #include <cmath>

diff --git a/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h b/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h
index b0f7b48..523b1d0 100644
--- a/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h
+++ b/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h
@@ -31,7 +31,7 @@ for which a new license (GPL+exception) is in place.
 #include "scplugin.h"
 #include "selection.h"
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 
diff --git a/scribus/plugins/tools/transform/transformdialog.cpp b/scribus/plugins/tools/transform/transformdialog.cpp
index ee4df56..4c05419 100644
--- a/scribus/plugins/tools/transform/transformdialog.cpp
+++ b/scribus/plugins/tools/transform/transformdialog.cpp
@@ -30,7 +30,7 @@ for which a new license (GPL+exception) is in place.
 #include "commonstrings.h"
 #include "units.h"
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 #include <cmath>
diff --git a/scribus/polygonwidget.cpp b/scribus/polygonwidget.cpp
index 5acc987..e4a51b9 100644
--- a/scribus/polygonwidget.cpp
+++ b/scribus/polygonwidget.cpp
@@ -11,7 +11,7 @@ for which a new license (GPL+exception) is in place.
 #include <QPainterPath>
 #include <QRectF>
 
-#if _MSC_VER
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 #include <cmath>
diff --git a/scribus/propertiespalette.cpp b/scribus/propertiespalette.cpp
index 681352e..aca6344 100644
--- a/scribus/propertiespalette.cpp
+++ b/scribus/propertiespalette.cpp
@@ -41,7 +41,7 @@ for which a new license (GPL+exception) is in place.
 #include <QValidator>
 #include <QWidget>
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
 #define _USE_MATH_DEFINES
 #endif
 #include <cmath>
diff --git a/scribus/sclimits.h b/scribus/sclimits.h
index 258dbba..2c3eea2 100644
--- a/scribus/sclimits.h
+++ b/scribus/sclimits.h
@@ -8,7 +8,9 @@ for which a new license (GPL+exception) is in place.
 #define SCLIMITS_H

 

 #if defined(_MSC_VER)

-#define _USE_MATH_DEFINES

+#if !defined(_USE_MATH_DEFINES)

+	#define _USE_MATH_DEFINES

+#endif

 #define NOMINMAX

 #endif

 

diff --git a/scribus/util_math.h b/scribus/util_math.h
index 4948f0b..f8c669c 100644
--- a/scribus/util_math.h
+++ b/scribus/util_math.h
@@ -7,7 +7,7 @@ for which a new license (GPL+exception) is in place.
 #ifndef _UTIL_MATH_H

 #define _UTIL_MATH_H

 

-#if defined(_MSC_VER)

+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)

 #define _USE_MATH_DEFINES

 #endif

 #include <cmath>