[mapguide-commits] r4648 - in trunk/MgDev/Common: Renderers Stylization

[svn_mapguide at osgeo.org]

Author: waltweltonlair
Date: 2010-03-10 15:00:15 -0500 (Wed, 10 Mar 2010)
New Revision: 4648

Modified:
   trunk/MgDev/Common/Renderers/Renderers.vcproj
   trunk/MgDev/Common/Stylization/MathHelper.h
   trunk/MgDev/Common/Stylization/Stylization.vcproj
Log:
Remove WIN64 / _WIN64 preprocessor definitions from vcproj files.  Visual Studio always
defines _WIN64 when building x64 configurations.

Modified: trunk/MgDev/Common/Renderers/Renderers.vcproj
===================================================================
--- trunk/MgDev/Common/Renderers/Renderers.vcproj	2010-03-10 19:49:58 UTC (rev 4647)
+++ trunk/MgDev/Common/Renderers/Renderers.vcproj	2010-03-10 20:00:15 UTC (rev 4648)
@@ -127,7 +127,7 @@
 				AdditionalOptions="$(USRCFLAGS)"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;..\..\Oem\DWFTK7.1\develop\global\src;..\..\Oem\DWFTK7.1\develop\global\src\dwf;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;"..\..\Oem\agg-2.4\include";"..\..\Oem\agg-2.4\font_freetype";..\..\Oem\gd\lpng;..\..\Oem\gd\zlib"
-				PreprocessorDefinitions="WIN32;WIN64;_DEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"

Modified: trunk/MgDev/Common/Stylization/MathHelper.h
===================================================================
--- trunk/MgDev/Common/Stylization/MathHelper.h	2010-03-10 19:49:58 UTC (rev 4647)
+++ trunk/MgDev/Common/Stylization/MathHelper.h	2010-03-10 20:00:15 UTC (rev 4648)
@@ -21,15 +21,15 @@
 #include "Foundation.h"
 #include <math.h>
 
-const double    EPSILON     = 1e-10;
+const double EPSILON = 1e-10;
 
 //this is the definition of an empty value for double precision fields
 #ifdef _WIN32
-const INT64   dblNaN      = 0xFFFFFFFFFFFFFFFF; //quiet NaN
+const INT64 dblNaN = 0xFFFFFFFFFFFFFFFF; //quiet NaN
 #else
-const INT64   dblNaN      = 0xFFFFFFFFFFFFFFFFLL; //quiet NaN
+const INT64 dblNaN = 0xFFFFFFFFFFFFFFFFLL; //quiet NaN
 #endif
-const double    DBL_NAN     = *(double*)&dblNaN;
+const double DBL_NAN = *(double*)&dblNaN;
 
 inline bool ISNAN(double& d)
 {

Modified: trunk/MgDev/Common/Stylization/Stylization.vcproj
===================================================================
--- trunk/MgDev/Common/Stylization/Stylization.vcproj	2010-03-10 19:49:58 UTC (rev 4647)
+++ trunk/MgDev/Common/Stylization/Stylization.vcproj	2010-03-10 20:00:15 UTC (rev 4648)
@@ -128,7 +128,7 @@
 				AdditionalOptions="$(USRCFLAGS)"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\MdfModel;..\Foundation;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine"
-				PreprocessorDefinitions="WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;STYLIZATION_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;STYLIZATION_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
 				BasicRuntimeChecks="3"
@@ -298,7 +298,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="false"
 				AdditionalIncludeDirectories="..\MdfModel;..\Foundation;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine"
-				PreprocessorDefinitions="WIN32;WIN64;_NDEBUG;_WINDOWS;_USRDLL;STYLIZATION_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;_NDEBUG;_WINDOWS;_USRDLL;STYLIZATION_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
 				WarningLevel="3"