ChangeLogTag:Thu Oct 6 17:52:41 2005 Steve Huston <shuston@riverace.com>

6 files changed, 98 insertions, 5 deletions

diff --git a/templates/vc8.mpd b/templates/vc8.mpd
index 3572ea82..2cb2c68b 100644
--- a/templates/vc8.mpd
+++ b/templates/vc8.mpd
@@ -9,18 +9,21 @@
 	SignManifests="true"
 	>
 	<Platforms>
+<%foreach(platforms)%>
 		<Platform
-			Name="<%platform("Win32")%>"
+			Name="<%platform%>"
 		/>
+<%endfor%>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 		<Configuration
 			Name="<%configuration%>|<%platform%>"
-			OutputDirectory="<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%><%else%><%if(type_is_static)%><%libout%><%else%><%if(install)%><%install%><%else%><%output_dir%><%endif%><%endif%><%endif%>"
-			IntermediateDirectory="<%intermediate_dir%>\<%noextension(project_file)%>"
+			OutputDirectory="<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%><%else%><%if(type_is_static)%><%libout%><%else%><%if(install)%><%install%><%else%><%output_dir%><%endif%><%endif%><%endif%><%if(output_subdir)%>\<%output_subdir%><%endif%>"
+			IntermediateDirectory="<%intermediate_dir%>\<%noextension(project_file)%><%if(output_subdir)%>\<%output_subdir%><%endif%>"
 <%if(type_is_static && staticname)%>
 			ConfigurationType="4"
 <%else%>
@@ -87,7 +90,7 @@
 <%if(AdditionalUsingDirectories)%>
 				AdditionalUsingDirectories="<%AdditionalUsingDirectories%>"
 <%endif%>
-				PreprocessorDefinitions="<%if(unicode)%>UNICODE;_UNICODE;<%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%><%dynamicflag%>;<%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%><%staticflag%>;<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%><%pch_define%>;<%endfor%><%endif%><%foreach(defines common_defines macros)%><%define%><%fornotlast(";")%><%endfor%>"
+				PreprocessorDefinitions="<%if(unicode)%>UNICODE;_UNICODE;<%endif%><%if(type_is_dynamic)%><%foreach(dynamicflags)%><%dynamicflag%>;<%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%><%staticflag%>;<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%><%pch_define%>;<%endfor%><%endif%><%foreach(defines common_defines cpu_defines platform_defines macros)%><%define%><%fornotlast(";")%><%endfor%>"
 <%if(IgnoreStandardIncludePath)%>
 				IgnoreStandardIncludePath="<%IgnoreStandardIncludePath%>"
 <%endif%>
@@ -170,7 +173,7 @@
 				ObjectFile="<%ObjectFile%>"
 <%endif%>
 <%if(pdbc)%>
-				ProgramDataBaseFileName="<%if(type_is_static)%><%libout%>\<%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb<%else%><%intermediate_dir%>\<%noextension(project_file)%>/<%endif%>"
+				ProgramDataBaseFileName="<%if(output_subdir)%><%output_subdir%>\<%endif%><%if(type_is_static)%><%libout%>\<%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb<%else%><%intermediate_dir%>\<%noextension(project_file)%><%endif%><%if(output_subdir)%>\<%output_subdir%><%endif%>/"
 <%else%>
 <%if(ProgramDataBaseFileName)%>
 				ProgramDataBaseFileName="<%ProgramDataBaseFileName%>"
@@ -478,6 +481,7 @@
 			/>
 		</Configuration>
 <%endfor%>
+<%endfor%>
 	</Configurations>
 	<References>
 	</References>
@@ -490,6 +494,7 @@
 <%if(pch_source)%>
 			<File
 				RelativePath="<%pch_source%>">
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 				<FileConfiguration
 					Name="<%configuration%>|<%platform%>">
@@ -498,6 +503,7 @@
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 <%endfor%>
+<%endfor%>
 			</File>
 <%endif%>
 <%if(grouped_source_files)%>
@@ -507,6 +513,7 @@
 			<File
 				RelativePath="<%grouped_source_file->file%>">
 <%if(duplicate_index(grouped_source_file->file))%>
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 				<FileConfiguration
 					Name="<%configuration%>|<%platform%>">
@@ -515,6 +522,7 @@
 						ObjectFile="$(IntDir)\$(InputName)<%duplicate_index(grouped_source_file->file)%>.obj"/>
 				</FileConfiguration>
 <%endfor%>
+<%endfor%>
 <%endif%>
 			</File>
 <%endfor%>
@@ -526,6 +534,7 @@
 				<File
 					RelativePath="<%grouped_source_file->file%>">
 <%if(duplicate_index(grouped_source_file->file))%>
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 					<FileConfiguration
 						Name="<%configuration%>|<%platform%>">
@@ -534,6 +543,7 @@
 							ObjectFile="$(IntDir)\$(InputName)<%duplicate_index(grouped_source_file->file)%>.obj"/>
 					</FileConfiguration>
 <%endfor%>
+<%endfor%>
 <%endif%>
 				</File>
 <%endfor%>
@@ -545,6 +555,7 @@
 			<File
 				RelativePath="<%source_file%>">
 <%if(duplicate_index(source_file))%>
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 					<FileConfiguration
 						Name="<%configuration%>|<%platform%>">
@@ -553,6 +564,7 @@
 						ObjectFile="$(IntDir)\$(InputName)<%duplicate_index(source_file)%>.obj"/>
 					</FileConfiguration>
 <%endfor%>
+<%endfor%>
 <%endif%>
 			</File>
 <%endfor%>
@@ -606,6 +618,7 @@
 <%foreach(custom_type->input_files)%>
 			<File
 				RelativePath="<%custom_type->input_file%>">
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 				<FileConfiguration
 					Name="<%configuration%>|<%platform%>"
@@ -633,6 +646,7 @@
 <%endif%>
 				</FileConfiguration>
 <%endfor%>
+<%endfor%>
 			</File>
 <%endfor%>
 		</Filter>
@@ -681,6 +695,7 @@
 <%foreach(grouped_template_file->files)%>
 			<File
 				RelativePath="<%grouped_template_file->file%>">
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 				<FileConfiguration
 					Name="<%configuration%>|<%platform%>"
@@ -689,6 +704,7 @@
 						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 <%endfor%>
+<%endfor%>
 			</File>
 <%endfor%>
 <%else%>
@@ -698,6 +714,7 @@
 <%foreach(grouped_template_file->files)%>
 				<File
 					RelativePath="<%grouped_template_file->file%>">
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 					<FileConfiguration
 						Name="<%configuration%>|<%platform%>"
@@ -706,6 +723,7 @@
 							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
 <%endfor%>
+<%endfor%>
 				</File>
 <%endfor%>
 			</Filter>
@@ -715,6 +733,7 @@
 <%foreach(template_files)%>
 			<File
 				RelativePath="<%template_file%>">
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 				<FileConfiguration
 					Name="<%configuration%>|<%platform%>"
@@ -723,6 +742,7 @@
 						Name="VCCLCompilerTool"/>
 				</FileConfiguration>
 <%endfor%>
+<%endfor%>
 			</File>
 <%endfor%>
 <%endif%>
@@ -738,6 +758,7 @@
 <%foreach(grouped_documentation_file->files)%>
 			<File
 				RelativePath="<%grouped_documentation_file->file%>">
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 				<FileConfiguration
 					Name="<%configuration%>|<%platform%>"
@@ -746,6 +767,7 @@
 						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 <%endfor%>
+<%endfor%>
 			</File>
 <%endfor%>
 <%else%>
@@ -755,6 +777,7 @@
 <%foreach(grouped_documentation_file->files)%>
 				<File
 					RelativePath="<%grouped_documentation_file->file%>">
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 					<FileConfiguration
 						Name="<%configuration%>|<%platform%>"
@@ -763,6 +786,7 @@
 							Name="VCCustomBuildTool"/>
 					</FileConfiguration>
 <%endfor%>
+<%endfor%>
 				</File>
 <%endfor%>
 			</Filter>
@@ -772,6 +796,7 @@
 <%foreach(documentation_files)%>
 			<File
 				RelativePath="<%documentation_file%>">
+<%foreach(platforms)%>
 <%foreach(configurations)%>
 				<FileConfiguration
 					Name="<%configuration%>|<%platform%>"
@@ -780,6 +805,7 @@
 						Name="VCCustomBuildTool"/>
 				</FileConfiguration>
 <%endfor%>
+<%endfor%>
 			</File>
 <%endfor%>
 <%endif%>
diff --git a/templates/vc8dll.mpt b/templates/vc8dll.mpt
index 79e400f2..b5a38205 100644
--- a/templates/vc8dll.mpt
+++ b/templates/vc8dll.mpt
@@ -11,6 +11,8 @@ use_lib_modifier   = 1
 Detect64BitPortabilityProblems = false
 MinimalRebuild     = false
 
+conditional_include "vc8platforms"
+
 Release {
   LinkIncremental  = 1
   optimize         = 2
diff --git a/templates/vc8exe.mpt b/templates/vc8exe.mpt
index 2a208403..6f8518bc 100644
--- a/templates/vc8exe.mpt
+++ b/templates/vc8exe.mpt
@@ -11,6 +11,8 @@ SubSystem          = 1
 Detect64BitPortabilityProblems = false
 MinimalRebuild     = false
 
+conditional_include "vc8platforms"
+
 Release {
   LinkIncremental  = 1
   optimize         = 2
diff --git a/templates/vc8lib.mpt b/templates/vc8lib.mpt
index 14f922d2..56fdd08b 100644
--- a/templates/vc8lib.mpt
+++ b/templates/vc8lib.mpt
@@ -11,6 +11,8 @@ use_lib_modifier   = 1
 Detect64BitPortabilityProblems = false
 MinimalRebuild     = false
 
+conditional_include "vc8platforms"
+
 Release {
   optimize         = 2
   defines          = NDEBUG
diff --git a/templates/vc8libexe.mpt b/templates/vc8libexe.mpt
index 3c397968..b78b29a5 100644
--- a/templates/vc8libexe.mpt
+++ b/templates/vc8libexe.mpt
@@ -11,6 +11,8 @@ SubSystem          = 1
 Detect64BitPortabilityProblems = false
 MinimalRebuild     = false
 
+conditional_include "vc8platforms"
+
 Release {
   LinkIncremental  = 1
   optimize         = 2
diff --git a/templates/vc8platforms.mpt b/templates/vc8platforms.mpt
new file mode 100644
index 00000000..531dd4de
--- /dev/null
+++ b/templates/vc8platforms.mpt
@@ -0,0 +1,59 @@
+// -*- MPC -*-
+// $Id$
+//
+// Any of these platforms can set using value_template platforms=
+// when generating solutions/projects.
+//
+//platforms = Win32 WinX86_64 "Pocket PC 2003 (ARMV4)" "Smartphone 2003 (ARMV4)" "Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" "Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+
+platforms = Win32
+default_platform = Win32
+
+Win32 {
+  cpu_defines      = _M_IX86
+}
+
+WinX86_64 {
+  output_subdir    = Win64
+  cpu_defines      = _M_AXP64
+  platform_defines = _WIN64
+}
+
+Pocket PC 2003 (ARMV4) {
+  output_subdir    = PocketPC2003_ARMV4
+  cpu_defines      = $(ARCHFAM) $(_ARCHFAM_)
+  platform_defines = UNDER_CE=$(CEVER) _WIN32_WCE=$(CEVER) WINCE $(PLATFORMDEFINES) _WINDOWS _UNICODE UNICODE POCKETPC2003_UI_MODEL
+  link_options     = /subsystem:windowsce,4.20 /machine:ARM /ARMPADCODE
+  lit_libs        += ccrtrtti
+  subsystem        = "0"
+  TargetMachine    = "3"
+}
+
+Smartphone 2003 (ARMV4) {
+  output_subdir    = Smartphone2003_ARMV4
+  cpu_defines      = $(ARCHFAM) $(_ARCHFAM_)
+  platform_defines = UNDER_CE=$(CEVER) _WIN32_WCE=$(CEVER) WINCE $(PLATFORMDEFINES) _WINDOWS _UNICODE UNICODE SMARTPHONE2003_UI_MODEL
+  link_options     = /subsystem:windowsce,4.20 /machine:ARM /ARMPADCODE
+  subsystem        = "0"
+  TargetMachine    = "3"
+}
+
+Windows Mobile 5.0 Pocket PC SDK (ARMV4I) {
+  output_subdir    = WinMobile50_PocketPC_ARMV4I
+  cpu_defines      = $(ARCHFAM) $(_ARCHFAM_)
+  platform_defines = UNDER_CE=$(CEVER) _WIN32_WCE=$(CEVER) WINCE $(PLATFORMDEFINES) _WINDOWS _UNICODE UNICODE POCKETPC2003_UI_MODEL
+  link_options     = /subsystem:windowsce,5.01 /machine:THUMB
+  subsystem        = "0"
+  TargetMachine    = "3"
+}
+
+Windows Mobile 5.0 Smartphone SDK (ARMV4I) {
+  output_subdir    = WinMobile50_Smartphone_ARMV4I
+  cpu_defines      = $(ARCHFAM) $(_ARCHFAM_)
+  platform_defines = UNDER_CE=$(CEVER) _WIN32_WCE=$(CEVER) WINCE $(PLATFORMDEFINES) _WINDOWS _UNICODE UNICODE SMARTPHONE2003_UI_MODEL
+  link_options     = /subsystem:windowsce,5.01 /machine:THUMB
+  subsystem        = "0"
+  TargetMachine    = "3"
+}
+
+