r17537 by jghali - msvc project update : some modifications to ease transition to msvc 2010/msvc 2012

scribus-commit scribus-commit at lists.scribus.net
Sat Jun 2 17:52:34 UTC 2012


Author: jghali
Date: Sat Jun  2 17:52:34 2012
New Revision: 17537

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17537
Log:
msvc project update : some modifications to ease transition to msvc 2010/msvc 2012

Added:
    trunk/Scribus/win32/vc9/Scribus-build-props.vsprops
      - copied, changed from r17525, trunk/Scribus/win32/vc9/Scribus-build.vsprops
    trunk/Scribus/win32/vc9/Scribus-build-rules.rules
      - copied, changed from r17525, trunk/Scribus/win32/vc9/Scribus-build.rules
Modified:
    trunk/Scribus/BUILDING_win32_msvc.txt
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/win32/vc9/Scribus-build.rules
    trunk/Scribus/win32/vc9/Scribus-build.vsprops
    trunk/Scribus/win32/vc9/aiimport/aiimport.vcproj
    trunk/Scribus/win32/vc9/barcodegenerator/barcodegenerator.vcproj
    trunk/Scribus/win32/vc9/cgmimport/cgmimport.vcproj
    trunk/Scribus/win32/vc9/colorwheel/colorwheel.vcproj
    trunk/Scribus/win32/vc9/cvgimport/cvgimport.vcproj
    trunk/Scribus/win32/vc9/drwimport/drwimport.vcproj
    trunk/Scribus/win32/vc9/flattenpath/flattenpath.vcproj
    trunk/Scribus/win32/vc9/fontpreview/fontpreview.vcproj
    trunk/Scribus/win32/vc9/gettext-csvim/gettext-csvim.vcproj
    trunk/Scribus/win32/vc9/gettext-docim/gettext-docim.vcproj
    trunk/Scribus/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj
    trunk/Scribus/win32/vc9/gettext-odtim/gettext-odtim.vcproj
    trunk/Scribus/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj
    trunk/Scribus/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj
    trunk/Scribus/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj
    trunk/Scribus/win32/vc9/gettext-txtim/gettext-txtim.vcproj
    trunk/Scribus/win32/vc9/gettext-xtgim/gettext-xtgim.vcproj
    trunk/Scribus/win32/vc9/hunspellcheck/hunspellcheck.vcproj
    trunk/Scribus/win32/vc9/idmlimport/idmlimport.vcproj
    trunk/Scribus/win32/vc9/lenseffects/lenseffects.vcproj
    trunk/Scribus/win32/vc9/meshdistortion/meshdistortion.vcproj
    trunk/Scribus/win32/vc9/oodrawimport/oodrawimport.vcproj
    trunk/Scribus/win32/vc9/pathalongpath/pathalongpath.vcproj
    trunk/Scribus/win32/vc9/pathconnect/pathconnect.vcproj
    trunk/Scribus/win32/vc9/pathcut/pathcut.vcproj
    trunk/Scribus/win32/vc9/pathfinder/pathfinder.vcproj
    trunk/Scribus/win32/vc9/pathstroker/pathstroker.vcproj
    trunk/Scribus/win32/vc9/pctimport/pctimport.vcproj
    trunk/Scribus/win32/vc9/pdfimport/pdfimport.vcproj
    trunk/Scribus/win32/vc9/picturebrowser/picturebrowser.vcproj
    trunk/Scribus/win32/vc9/pixmapexport/pixmapexport.vcproj
    trunk/Scribus/win32/vc9/psimport/psimport.vcproj
    trunk/Scribus/win32/vc9/saveastemplate/saveastemplate.vcproj
    trunk/Scribus/win32/vc9/scribus-cairo/scribus-cairo.vcproj
    trunk/Scribus/win32/vc9/scribus-desaxe/scribus-desaxe.vcproj
    trunk/Scribus/win32/vc9/scribus-lib2geom/scribus-lib2geom.vcproj
    trunk/Scribus/win32/vc9/scribus-main/Scribus.vcproj
    trunk/Scribus/win32/vc9/scribus-main/scribuspch.h
    trunk/Scribus/win32/vc9/scribus-pgf/scribus-pgf.vcproj
    trunk/Scribus/win32/vc9/scribus-wpg/scribus-wpg.vcproj
    trunk/Scribus/win32/vc9/scribus12format/scribus12format.vcproj
    trunk/Scribus/win32/vc9/scribus134format/scribus134format.vcproj
    trunk/Scribus/win32/vc9/scribus13format/scribus13format.vcproj
    trunk/Scribus/win32/vc9/scribus150format/scribus150format.vcproj
    trunk/Scribus/win32/vc9/scriptplugin/scriptplugin.vcproj
    trunk/Scribus/win32/vc9/shapeimport/shapeimport.vcproj
    trunk/Scribus/win32/vc9/shortwords/shortwords.vcproj
    trunk/Scribus/win32/vc9/smlimport/smlimport.vcproj
    trunk/Scribus/win32/vc9/smoothpath/smoothpath.vcproj
    trunk/Scribus/win32/vc9/subdivide/subdivide.vcproj
    trunk/Scribus/win32/vc9/svgexport/svgexport.vcproj
    trunk/Scribus/win32/vc9/svgimport/svgimport.vcproj
    trunk/Scribus/win32/vc9/transform/transform.vcproj
    trunk/Scribus/win32/vc9/uniconvimport/uniconvimport.vcproj
    trunk/Scribus/win32/vc9/wmfimport/wmfimport.vcproj
    trunk/Scribus/win32/vc9/wpgimport/wpgimport.vcproj
    trunk/Scribus/win32/vc9/xarimport/xarimport.vcproj
    trunk/Scribus/win32/vc9/xfigimport/xfigimport.vcproj

Modified: trunk/Scribus/BUILDING_win32_msvc.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/BUILDING_win32_msvc.txt
==============================================================================
--- trunk/Scribus/BUILDING_win32_msvc.txt (original)
+++ trunk/Scribus/BUILDING_win32_msvc.txt Sat Jun  2 17:52:34 2012
@@ -29,7 +29,7 @@
 
 Some more details can be found below in the section entitled GETTING DEPENDENCIES.
 
-After having installed all dependencies, open Scribus-build.vsprops files located 
+After having installed all dependencies, open Scribus-build-props.vsprops files located 
 in Scribus\win32\vc9 and update the dependency paths to match your system.
 
 Open the Visual Studio solution located in Scribus\win32\vc9 and start building. The *-cairo 

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sat Jun  2 17:52:34 2012
@@ -433,13 +433,10 @@
   ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN
                   -DAVOID_WIN32_FILEIO
                   -D_CRT_SECURE_NO_DEPRECATE
+                  -D_USE_MATH_DEFINES
                   -DCOMPILE_PLUGIN_AS_DLL
   )
   SET(BUILD_WINDOWS_VERSION 1)
-  SET(SC_USE_GDI 1)
-  IF(NOT SC_SHOULD_NOT_USE_GDIPLUS)
-    SET(SC_USE_GDIPLUS 1)
-  ENDIF(NOT SC_SHOULD_NOT_USE_GDIPLUS)
   SET(DLL_USE_NATIVE_API 1)
 ENDIF(WIN32)
 

Modified: trunk/Scribus/win32/vc9/aiimport/aiimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/aiimport/aiimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/aiimport/aiimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/aiimport/aiimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/barcodegenerator/barcodegenerator.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/barcodegenerator/barcodegenerator.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/barcodegenerator/barcodegenerator.vcproj (original)
+++ trunk/Scribus/win32/vc9/barcodegenerator/barcodegenerator.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/cgmimport/cgmimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/cgmimport/cgmimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/cgmimport/cgmimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/cgmimport/cgmimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/colorwheel/colorwheel.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/colorwheel/colorwheel.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/colorwheel/colorwheel.vcproj (original)
+++ trunk/Scribus/win32/vc9/colorwheel/colorwheel.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -249,14 +249,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -267,14 +267,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -285,14 +285,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/cvgimport/cvgimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/cvgimport/cvgimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/cvgimport/cvgimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/cvgimport/cvgimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/drwimport/drwimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/drwimport/drwimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/drwimport/drwimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/drwimport/drwimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/flattenpath/flattenpath.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/flattenpath/flattenpath.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/flattenpath/flattenpath.vcproj (original)
+++ trunk/Scribus/win32/vc9/flattenpath/flattenpath.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -241,14 +241,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/fontpreview/fontpreview.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/fontpreview/fontpreview.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/fontpreview/fontpreview.vcproj (original)
+++ trunk/Scribus/win32/vc9/fontpreview/fontpreview.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/gettext-csvim/gettext-csvim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/gettext-csvim/gettext-csvim.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/gettext-csvim/gettext-csvim.vcproj (original)
+++ trunk/Scribus/win32/vc9/gettext-csvim/gettext-csvim.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/gettext-docim/gettext-docim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/gettext-docim/gettext-docim.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/gettext-docim/gettext-docim.vcproj (original)
+++ trunk/Scribus/win32/vc9/gettext-docim/gettext-docim.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -241,14 +241,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj (original)
+++ trunk/Scribus/win32/vc9/gettext-htmlim/gettext-htmlim.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"

Modified: trunk/Scribus/win32/vc9/gettext-odtim/gettext-odtim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/gettext-odtim/gettext-odtim.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/gettext-odtim/gettext-odtim.vcproj (original)
+++ trunk/Scribus/win32/vc9/gettext-odtim/gettext-odtim.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -257,14 +257,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj (original)
+++ trunk/Scribus/win32/vc9/gettext-pdbim/gettext-pdbim.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"

Modified: trunk/Scribus/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj (original)
+++ trunk/Scribus/win32/vc9/gettext-sxwim/gettext-sxwim.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -261,14 +261,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj (original)
+++ trunk/Scribus/win32/vc9/gettext-textfilter/gettext-textfilter.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -253,14 +253,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -271,14 +271,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/gettext-txtim/gettext-txtim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/gettext-txtim/gettext-txtim.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/gettext-txtim/gettext-txtim.vcproj (original)
+++ trunk/Scribus/win32/vc9/gettext-txtim/gettext-txtim.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"

Modified: trunk/Scribus/win32/vc9/gettext-xtgim/gettext-xtgim.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/gettext-xtgim/gettext-xtgim.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/gettext-xtgim/gettext-xtgim.vcproj (original)
+++ trunk/Scribus/win32/vc9/gettext-xtgim/gettext-xtgim.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins\gettext"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -266,14 +266,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -284,14 +284,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/hunspellcheck/hunspellcheck.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/hunspellcheck/hunspellcheck.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/hunspellcheck/hunspellcheck.vcproj (original)
+++ trunk/Scribus/win32/vc9/hunspellcheck/hunspellcheck.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -249,28 +249,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -281,28 +281,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -313,28 +313,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/idmlimport/idmlimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/idmlimport/idmlimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/idmlimport/idmlimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/idmlimport/idmlimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/lenseffects/lenseffects.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/lenseffects/lenseffects.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/lenseffects/lenseffects.vcproj (original)
+++ trunk/Scribus/win32/vc9/lenseffects/lenseffects.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/meshdistortion/meshdistortion.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/meshdistortion/meshdistortion.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/meshdistortion/meshdistortion.vcproj (original)
+++ trunk/Scribus/win32/vc9/meshdistortion/meshdistortion.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/oodrawimport/oodrawimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/oodrawimport/oodrawimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/oodrawimport/oodrawimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/oodrawimport/oodrawimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/pathalongpath/pathalongpath.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/pathalongpath/pathalongpath.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/pathalongpath/pathalongpath.vcproj (original)
+++ trunk/Scribus/win32/vc9/pathalongpath/pathalongpath.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/pathconnect/pathconnect.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/pathconnect/pathconnect.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/pathconnect/pathconnect.vcproj (original)
+++ trunk/Scribus/win32/vc9/pathconnect/pathconnect.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/pathcut/pathcut.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/pathcut/pathcut.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/pathcut/pathcut.vcproj (original)
+++ trunk/Scribus/win32/vc9/pathcut/pathcut.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -241,14 +241,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/pathfinder/pathfinder.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/pathfinder/pathfinder.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/pathfinder/pathfinder.vcproj (original)
+++ trunk/Scribus/win32/vc9/pathfinder/pathfinder.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/pathstroker/pathstroker.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/pathstroker/pathstroker.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/pathstroker/pathstroker.vcproj (original)
+++ trunk/Scribus/win32/vc9/pathstroker/pathstroker.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -241,14 +241,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/pctimport/pctimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/pctimport/pctimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/pctimport/pctimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/pctimport/pctimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/pdfimport/pdfimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/pdfimport/pdfimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/pdfimport/pdfimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/pdfimport/pdfimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -249,14 +249,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -267,14 +267,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/picturebrowser/picturebrowser.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/picturebrowser/picturebrowser.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/picturebrowser/picturebrowser.vcproj (original)
+++ trunk/Scribus/win32/vc9/picturebrowser/picturebrowser.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -277,14 +277,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -295,14 +295,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -313,14 +313,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -335,14 +335,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -353,14 +353,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -371,14 +371,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -389,14 +389,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -411,14 +411,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/pixmapexport/pixmapexport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/pixmapexport/pixmapexport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/pixmapexport/pixmapexport.vcproj (original)
+++ trunk/Scribus/win32/vc9/pixmapexport/pixmapexport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/psimport/psimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/psimport/psimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/psimport/psimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/psimport/psimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/saveastemplate/saveastemplate.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/saveastemplate/saveastemplate.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/saveastemplate/saveastemplate.vcproj (original)
+++ trunk/Scribus/win32/vc9/saveastemplate/saveastemplate.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/scribus-cairo/scribus-cairo.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus-cairo/scribus-cairo.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus-cairo/scribus-cairo.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus-cairo/scribus-cairo.vcproj Sat Jun  2 17:52:34 2012
@@ -21,7 +21,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			UseOfMFC="0"
 			CharacterSet="2"
 			>
@@ -106,7 +106,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="2"
 			>
 			<Tool

Modified: trunk/Scribus/win32/vc9/scribus-desaxe/scribus-desaxe.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus-desaxe/scribus-desaxe.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus-desaxe/scribus-desaxe.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus-desaxe/scribus-desaxe.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="uic.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -102,7 +102,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
 			>
@@ -110,19 +110,19 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="uic.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"

Modified: trunk/Scribus/win32/vc9/scribus-lib2geom/scribus-lib2geom.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus-lib2geom/scribus-lib2geom.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus-lib2geom/scribus-lib2geom.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus-lib2geom/scribus-lib2geom.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="uic.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -102,7 +102,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
 			>
@@ -110,19 +110,19 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="uic.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"

Modified: trunk/Scribus/win32/vc9/scribus-main/Scribus.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus-main/Scribus.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus-main/Scribus.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus-main/Scribus.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -129,7 +129,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="1"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -137,19 +137,19 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
+				Name="moc"
 			/>
 			<Tool
-				Name="rcc.exe"
+				Name="rcc"
 			/>
 			<Tool
-				Name="lrelease.exe"
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -2266,14 +2266,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2284,14 +2284,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2302,14 +2302,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2320,14 +2320,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2338,14 +2338,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2356,14 +2356,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2374,14 +2374,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2392,14 +2392,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2414,14 +2414,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2432,14 +2432,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2450,14 +2450,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2468,14 +2468,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2486,14 +2486,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2504,14 +2504,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2522,14 +2522,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2540,14 +2540,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2558,14 +2558,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2576,14 +2576,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2594,14 +2594,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2616,14 +2616,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2634,14 +2634,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2668,14 +2668,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2686,14 +2686,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2704,14 +2704,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2722,14 +2722,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2740,14 +2740,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2778,14 +2778,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2796,14 +2796,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2826,14 +2826,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2844,14 +2844,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2862,14 +2862,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2880,14 +2880,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2910,14 +2910,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2932,14 +2932,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2970,14 +2970,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -2988,14 +2988,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3010,14 +3010,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3028,14 +3028,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3046,14 +3046,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3064,14 +3064,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3090,14 +3090,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3108,14 +3108,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3130,14 +3130,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3148,14 +3148,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3186,14 +3186,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3204,14 +3204,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3222,14 +3222,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3240,14 +3240,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3262,14 +3262,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3280,14 +3280,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3298,14 +3298,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3316,14 +3316,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3334,14 +3334,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3372,14 +3372,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3390,14 +3390,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3408,14 +3408,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3426,14 +3426,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3444,14 +3444,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3462,14 +3462,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3480,14 +3480,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3498,14 +3498,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3538,14 +3538,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3556,14 +3556,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3574,14 +3574,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3596,14 +3596,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3614,14 +3614,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3632,14 +3632,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3650,14 +3650,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3672,14 +3672,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3690,14 +3690,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3708,14 +3708,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3726,14 +3726,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3744,14 +3744,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3794,14 +3794,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3812,14 +3812,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3830,14 +3830,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3848,14 +3848,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3870,14 +3870,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3888,14 +3888,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3934,14 +3934,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3956,14 +3956,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3974,14 +3974,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -3992,14 +3992,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4010,14 +4010,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4036,14 +4036,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4054,14 +4054,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4076,14 +4076,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4098,14 +4098,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4116,14 +4116,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4134,14 +4134,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4152,14 +4152,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4170,14 +4170,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4188,14 +4188,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4206,14 +4206,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4228,14 +4228,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4250,14 +4250,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4268,14 +4268,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4286,14 +4286,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4311,7 +4311,7 @@
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4330,14 +4330,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4348,14 +4348,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4366,14 +4366,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4384,14 +4384,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4402,14 +4402,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4420,14 +4420,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4438,14 +4438,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4456,14 +4456,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4474,14 +4474,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4496,14 +4496,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4514,14 +4514,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4532,14 +4532,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4550,14 +4550,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4568,14 +4568,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4586,14 +4586,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4604,14 +4604,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4622,14 +4622,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4640,14 +4640,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4658,14 +4658,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4688,14 +4688,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4706,14 +4706,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4724,14 +4724,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4742,14 +4742,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4760,14 +4760,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4778,14 +4778,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4796,14 +4796,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4814,14 +4814,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4832,14 +4832,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4850,14 +4850,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4868,14 +4868,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4886,14 +4886,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4904,14 +4904,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4922,14 +4922,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4940,14 +4940,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4958,14 +4958,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4976,14 +4976,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -4994,14 +4994,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5012,14 +5012,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5030,14 +5030,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5048,14 +5048,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5066,14 +5066,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5084,14 +5084,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5102,14 +5102,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5120,14 +5120,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5138,14 +5138,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5156,14 +5156,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5182,14 +5182,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5204,14 +5204,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5222,14 +5222,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5240,14 +5240,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5258,14 +5258,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5284,14 +5284,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5302,14 +5302,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5320,14 +5320,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5338,14 +5338,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5356,14 +5356,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5374,14 +5374,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5392,14 +5392,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5410,14 +5410,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5428,14 +5428,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5446,14 +5446,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5464,14 +5464,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5482,14 +5482,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5500,14 +5500,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5518,14 +5518,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5536,14 +5536,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5554,14 +5554,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5572,14 +5572,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5590,14 +5590,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5608,14 +5608,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5626,14 +5626,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5644,14 +5644,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5662,14 +5662,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5680,14 +5680,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5698,14 +5698,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5716,14 +5716,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5734,14 +5734,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5752,14 +5752,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5770,14 +5770,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5788,14 +5788,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5806,14 +5806,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5824,14 +5824,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5842,14 +5842,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5860,14 +5860,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5878,14 +5878,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5896,14 +5896,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5914,14 +5914,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5940,14 +5940,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5958,14 +5958,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -5988,14 +5988,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6006,14 +6006,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6024,14 +6024,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6042,14 +6042,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6060,14 +6060,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6078,14 +6078,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6096,14 +6096,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6114,14 +6114,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6132,14 +6132,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6150,14 +6150,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6168,14 +6168,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6186,14 +6186,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6204,14 +6204,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6222,14 +6222,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6240,14 +6240,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6258,14 +6258,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6276,14 +6276,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6294,14 +6294,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6312,14 +6312,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6334,14 +6334,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6352,14 +6352,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6378,14 +6378,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6396,14 +6396,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6422,14 +6422,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6440,14 +6440,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6482,14 +6482,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6504,14 +6504,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6538,14 +6538,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6564,14 +6564,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6590,14 +6590,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6612,14 +6612,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6630,14 +6630,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6648,14 +6648,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6722,14 +6722,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6740,14 +6740,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6766,14 +6766,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6788,14 +6788,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6806,14 +6806,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6828,14 +6828,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6886,14 +6886,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6908,14 +6908,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6934,14 +6934,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6952,14 +6952,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6974,14 +6974,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -6996,14 +6996,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7014,14 +7014,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7032,14 +7032,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7058,14 +7058,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7076,14 +7076,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7098,14 +7098,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7116,14 +7116,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7158,14 +7158,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7180,14 +7180,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7206,14 +7206,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7224,14 +7224,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7250,14 +7250,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7268,14 +7268,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7286,14 +7286,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7304,14 +7304,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7326,14 +7326,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7344,14 +7344,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7362,14 +7362,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7380,14 +7380,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7398,14 +7398,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7416,14 +7416,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7434,14 +7434,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7452,14 +7452,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7470,14 +7470,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7488,14 +7488,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7506,14 +7506,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7524,14 +7524,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7560,14 +7560,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7578,14 +7578,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7596,14 +7596,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7614,14 +7614,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7632,14 +7632,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7650,14 +7650,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7668,14 +7668,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7686,14 +7686,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7704,14 +7704,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7722,14 +7722,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7740,14 +7740,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7758,14 +7758,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7780,14 +7780,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7798,14 +7798,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7820,14 +7820,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7838,14 +7838,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7868,14 +7868,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7886,14 +7886,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7904,14 +7904,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7926,14 +7926,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7944,14 +7944,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7962,14 +7962,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -7988,14 +7988,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8014,14 +8014,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8032,14 +8032,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8058,14 +8058,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8076,14 +8076,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8094,14 +8094,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8116,14 +8116,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8138,14 +8138,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8156,14 +8156,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8178,14 +8178,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8196,14 +8196,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8214,14 +8214,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8244,14 +8244,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8274,14 +8274,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8292,14 +8292,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8310,14 +8310,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8380,14 +8380,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -8398,14 +8398,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/scribus-main/scribuspch.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus-main/scribuspch.h
==============================================================================
--- trunk/Scribus/win32/vc9/scribus-main/scribuspch.h (original)
+++ trunk/Scribus/win32/vc9/scribus-main/scribuspch.h Sat Jun  2 17:52:34 2012
@@ -91,4 +91,9 @@
 
 #include <stdlib.h>
 
+#include "pageitem.h"
+#include "scribus.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
+
 #endif

Modified: trunk/Scribus/win32/vc9/scribus-pgf/scribus-pgf.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus-pgf/scribus-pgf.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus-pgf/scribus-pgf.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus-pgf/scribus-pgf.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="uic.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -102,7 +102,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
 			>
@@ -110,19 +110,19 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="uic.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"

Modified: trunk/Scribus/win32/vc9/scribus-wpg/scribus-wpg.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus-wpg/scribus-wpg.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus-wpg/scribus-wpg.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus-wpg/scribus-wpg.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="uic.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -102,7 +102,7 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="0"
 			>
@@ -110,19 +110,19 @@
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="uic.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"

Modified: trunk/Scribus/win32/vc9/scribus12format/scribus12format.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus12format/scribus12format.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus12format/scribus12format.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus12format/scribus12format.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/scribus134format/scribus134format.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus134format/scribus134format.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus134format/scribus134format.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus134format/scribus134format.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/scribus13format/scribus13format.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus13format/scribus13format.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus13format/scribus13format.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus13format/scribus13format.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/scribus150format/scribus150format.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scribus150format/scribus150format.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scribus150format/scribus150format.vcproj (original)
+++ trunk/Scribus/win32/vc9/scribus150format/scribus150format.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -249,14 +249,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -267,14 +267,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/scriptplugin/scriptplugin.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/scriptplugin/scriptplugin.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/scriptplugin/scriptplugin.vcproj (original)
+++ trunk/Scribus/win32/vc9/scriptplugin/scriptplugin.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -421,14 +421,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -439,14 +439,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -457,14 +457,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -475,14 +475,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -493,14 +493,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -511,14 +511,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/shapeimport/shapeimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/shapeimport/shapeimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/shapeimport/shapeimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/shapeimport/shapeimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/shortwords/shortwords.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/shortwords/shortwords.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/shortwords/shortwords.vcproj (original)
+++ trunk/Scribus/win32/vc9/shortwords/shortwords.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -265,14 +265,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -283,14 +283,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -301,14 +301,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -319,14 +319,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -337,14 +337,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -355,14 +355,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release-cairo|Win32"
-					>
-					<Tool
-						Name="moc.exe"
+						Name="moc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release-cairo|Win32"
+					>
+					<Tool
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/smlimport/smlimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/smlimport/smlimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/smlimport/smlimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/smlimport/smlimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/smoothpath/smoothpath.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/smoothpath/smoothpath.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/smoothpath/smoothpath.vcproj (original)
+++ trunk/Scribus/win32/vc9/smoothpath/smoothpath.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -241,14 +241,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/subdivide/subdivide.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/subdivide/subdivide.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/subdivide/subdivide.vcproj (original)
+++ trunk/Scribus/win32/vc9/subdivide/subdivide.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -241,14 +241,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/svgexport/svgexport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/svgexport/svgexport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/svgexport/svgexport.vcproj (original)
+++ trunk/Scribus/win32/vc9/svgexport/svgexport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -241,14 +241,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/svgimport/svgimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/svgimport/svgimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/svgimport/svgimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/svgimport/svgimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -241,14 +241,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/transform/transform.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/transform/transform.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/transform/transform.vcproj (original)
+++ trunk/Scribus/win32/vc9/transform/transform.vcproj Sat Jun  2 17:52:34 2012
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -23,23 +23,23 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -116,23 +116,23 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -213,23 +213,23 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -306,23 +306,23 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -430,28 +430,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -462,28 +462,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -519,28 +519,28 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="uic.exe"
+						Name="uic"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="uic.exe"
+						Name="uic"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug-arthur|Win32"
 					>
 					<Tool
-						Name="uic.exe"
+						Name="uic"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-arthur|Win32"
 					>
 					<Tool
-						Name="uic.exe"
+						Name="uic"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/uniconvimport/uniconvimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/uniconvimport/uniconvimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/uniconvimport/uniconvimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/uniconvimport/uniconvimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -241,14 +241,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/wmfimport/wmfimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/wmfimport/wmfimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/wmfimport/wmfimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/wmfimport/wmfimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -265,14 +265,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -283,14 +283,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/wpgimport/wpgimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/wpgimport/wpgimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/wpgimport/wpgimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/wpgimport/wpgimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/xarimport/xarimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/xarimport/xarimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/xarimport/xarimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/xarimport/xarimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -249,14 +249,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -267,14 +267,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -285,14 +285,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>

Modified: trunk/Scribus/win32/vc9/xfigimport/xfigimport.vcproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17537&path=/trunk/Scribus/win32/vc9/xfigimport/xfigimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc9/xfigimport/xfigimport.vcproj (original)
+++ trunk/Scribus/win32/vc9/xfigimport/xfigimport.vcproj Sat Jun  2 17:52:34 2012
@@ -15,7 +15,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="..\Scribus-build.rules"
+			RelativePath="..\Scribus-build-rules.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -24,26 +24,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -119,26 +119,26 @@
 			OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
 			IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\Scribus-build.vsprops"
+			InheritedPropertySheets="..\Scribus-build-props.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
-				Name="uic.exe"
+				Name="uic"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="moc.exe"
-			/>
-			<Tool
-				Name="rcc.exe"
-			/>
-			<Tool
-				Name="lrelease.exe"
+				Name="moc"
+			/>
+			<Tool
+				Name="rcc"
+			/>
+			<Tool
+				Name="lrelease"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -245,14 +245,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>
@@ -263,14 +263,14 @@
 					Name="Debug-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release-cairo|Win32"
 					>
 					<Tool
-						Name="moc.exe"
+						Name="moc"
 					/>
 				</FileConfiguration>
 			</File>




More information about the scribus-commit mailing list