backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

- some more tweaking in build script for Windows 8

Browse Source 
- Platform no makes a difference for Windows8 and Windows8ModernUI
This commit is contained in:
Glatzemann 2012-10-01 12:17:53 +00:00 committed by Konstantin Koch
parent 188bda28a5
commit 808e63f45a
13 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ANX.Framework/NonXNA/OSInformation.cs
View File

@ -27,7 +27,7 @@ namespace ANX.Framework.NonXNA
public static PlatformName GetName() public static PlatformName GetName()
{ {
#if WINDOWSMETRO #if WINDOWSMETRO
return PlatformName.Windows8; return PlatformName.Windows8ModernUI;
#elif PSVITA #elif PSVITA
return PlatformName.PSVita; return PlatformName.PSVita;
#elif ANDROID #elif ANDROID
@ -88,6 +88,10 @@ namespace ANX.Framework.NonXNA
{ {
return PlatformName.WindowsVista; return PlatformName.WindowsVista;
} }
else if (osVersion.Minor == 2)
{
return PlatformName.Windows8;
}
return PlatformName.Windows7; return PlatformName.Windows7;
} }

1
ANX.Framework/NonXNA/PlatformName.cs
View File

@ -11,6 +11,7 @@ namespace ANX.Framework.NonXNA
WindowsVista, WindowsVista,
Windows7, Windows7,
Windows8, Windows8,
Windows8ModernUI,
Linux, Linux,
MacOSX, MacOSX,
Android, Android,

3
ANX.Framework/NonXNA/PlatformSystem/PlatformSystem.cs
View File

@ -68,6 +68,7 @@ namespace ANX.Framework.NonXNA.PlatformSystem
{ {
switch (platform) switch (platform)
{ {
case PlatformName.Windows8:
case PlatformName.Windows7: case PlatformName.Windows7:
case PlatformName.WindowsVista: case PlatformName.WindowsVista:
case PlatformName.WindowsXP: case PlatformName.WindowsXP:
@ -75,7 +76,7 @@ namespace ANX.Framework.NonXNA.PlatformSystem
case PlatformName.Linux: case PlatformName.Linux:
case PlatformName.PSVita: case PlatformName.PSVita:
return prefix + platform.ToString() + suffix; return prefix + platform.ToString() + suffix;
case PlatformName.Windows8: case PlatformName.Windows8ModernUI:
return prefix + "Metro"; return prefix + "Metro";
default: default:
throw new PlatformSystemInstanceException("couldn't solve assembly name for platform '" + platform.ToString() + "'"); throw new PlatformSystemInstanceException("couldn't solve assembly name for platform '" + platform.ToString() + "'");

4
InputSystems/ANX.InputSystem.Recording/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.2.0")] [assembly: AssemblyVersion("0.0.3.*")]
[assembly: AssemblyFileVersion("0.0.2.0")] [assembly: AssemblyFileVersion("0.0.3.0")]

3
InputSystems/ANX.InputSystem.Recording/SupportedPlatformsImpl.cs
View File

@ -20,7 +20,8 @@ namespace ANX.InputSystem.Recording
PlatformName.WindowsXP, PlatformName.WindowsXP,
PlatformName.WindowsVista, PlatformName.WindowsVista,
PlatformName.Windows7, PlatformName.Windows7,
PlatformName.Windows8 PlatformName.Windows8,
PlatformName.Windows8ModernUI
}; };
} }
} }

4
PlatformSystems/ANX.PlatformSystem.Metro/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("0.9.1.*")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("0.9.1.0")]

2
PlatformSystems/ANX.PlatformSystem.Metro/SupportedPlatformsImpl.cs
View File

@ -15,7 +15,7 @@ namespace ANX.PlatformSystem.Metro
{ {
return new PlatformName[] return new PlatformName[]
{ {
PlatformName.Windows8, PlatformName.Windows8ModernUI,
}; };
} }
} }

4
PlatformSystems/ANX.PlatformSystem.Windows/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.75.0.*")] [assembly: AssemblyVersion("0.75.1.*")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("0.75.1.0")]

2
RenderSystems/ANX.RenderSystem.Windows.Metro/SupportedPlatformsImpl.cs
View File

@ -15,7 +15,7 @@ namespace ANX.RenderSystem.Windows.Metro
{ {
return new PlatformName[] return new PlatformName[]
{ {
PlatformName.Windows8, PlatformName.Windows8ModernUI,
}; };
} }
} }

8
Samples/SimpleNoContent/Properties/AssemblyInfo.cs
View File

@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden // Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die mit einer Assembly verknüpft sind. // die mit einer Assembly verknüpft sind.
[assembly: AssemblyTitle("SimpleModernUI")] [assembly: AssemblyTitle("SimpleNoContent")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SimpleModernUI")] [assembly: AssemblyProduct("SimpleNoContent")]
[assembly: AssemblyCopyright("Copyright © 2012")] [assembly: AssemblyCopyright("Copyright © 2012 ANX.Framework Development Team")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.0.*")]
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")]

1
SoundSystems/ANX.SoundSystem.Windows.XAudio/SupportedPlatformsImpl.cs
View File

@ -19,6 +19,7 @@ namespace ANX.SoundSystem.Windows.XAudio
PlatformName.WindowsXP, PlatformName.WindowsXP,
PlatformName.WindowsVista, PlatformName.WindowsVista,
PlatformName.Windows8, PlatformName.Windows8,
PlatformName.Windows8ModernUI,
}; };
} }
} }

2
Tools/ProjectConverter/Program.cs
View File

@ -31,6 +31,8 @@ namespace ProjectConverter
// For testing only // For testing only
//args = new[] { "/linux", "/psvita", "/windowsmetro", "../../ANX.Framework.sln" }; //args = new[] { "/linux", "/psvita", "/windowsmetro", "../../ANX.Framework.sln" };
Directory.SetCurrentDirectory(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location));
var switches = new List<string>(); var switches = new List<string>();
var keyValueParameters = new Dictionary<string,string>(); var keyValueParameters = new Dictionary<string,string>();
var files = new List<string>(); var files = new List<string>();

10
build/ANX.Framework.build
View File

@ -1,6 +1,7 @@
<project name="ANX.Framework Build" default="build" basedir="./"> <project name="ANX.Framework Build" default="build" basedir="./">
<property name="build.platform" value="Any CPU" /> <property name="build.platform" value="Any CPU" />
<property name="build.dir" value="../../bin" /> <property name="build.dir" value="../../bin" />
<property name="build.dir.base" value="${build.dir}" />
<property name="build.dir.tools" value="../bin" /> <property name="build.dir.tools" value="../bin" />
<property name="build.solution_dir" value="../" /> <property name="build.solution_dir" value="../" />
@ -474,7 +475,7 @@
<!-- <!--
<include name="**/*_WindowsMetro.csproj" /> <include name="**/*_WindowsMetro.csproj" />
--> -->
<exclude name="*" /> <include name="**/SimpleNoContent_WindowsMetro.csproj" />
</fileset> </fileset>
</if> </if>
@ -516,7 +517,7 @@
<arg value="/t:Build"/> <arg value="/t:Build"/>
<arg value="/p:Configuration=${build.configuration}"/> <arg value="/p:Configuration=${build.configuration}"/>
<arg value='/p:Platform="${build.platform}"'/> <arg value='/p:Platform="${build.platform}"'/>
<arg value="/p:OutputPath=${build.dir}/${build.configuration}" /> <arg value="/p:OutputPath=${build.dir.base}/${build.configuration}" />
<arg value="/p:AllowUnsafeBlocks=true" /> <arg value="/p:AllowUnsafeBlocks=true" />
<arg value="/p:SolutionDir=${build.solution_dir}" /> <arg value="/p:SolutionDir=${build.solution_dir}" />
<arg value='/p:DefineConstants="${project.anx.directives}"' /> <arg value='/p:DefineConstants="${project.anx.directives}"' />
@ -569,7 +570,7 @@
<arg value="/t:Build"/> <arg value="/t:Build"/>
<arg value="/p:Configuration=${build.configuration}"/> <arg value="/p:Configuration=${build.configuration}"/>
<arg value='/p:Platform="${build.platform}"'/> <arg value='/p:Platform="${build.platform}"'/>
<arg value="/p:OutputPath=${build.dir}/${build.configuration}" /> <arg value="/p:OutputPath=${build.dir.base}/${build.configuration}" />
<arg value="/p:AllowUnsafeBlocks=true" /> <arg value="/p:AllowUnsafeBlocks=true" />
<arg value="/p:SolutionDir=${build.solution_dir}" /> <arg value="/p:SolutionDir=${build.solution_dir}" />
<arg value='/p:DefineConstants="${project.anx.directives}"' /> <arg value='/p:DefineConstants="${project.anx.directives}"' />
@ -662,7 +663,8 @@
<include name="InputSystems/**/*.csproj" /> <include name="InputSystems/**/*.csproj" />
<include name="PlatformSystems/**/*.csproj" /> <include name="PlatformSystems/**/*.csproj" />
<include name="SoundSystems/**/*.csproj" /> <include name="SoundSystems/**/*.csproj" />
<include name="Samples/**/*.csproj" unless="${project.anx.metro}"/> <include name="Samples/**/*.csproj" />
<include name="Samples/**/SimpleNoContent.csproj" if="${project.anx.metro}" />
<exclude name="**/*_Linux.csproj" /> <exclude name="**/*_Linux.csproj" />
<exclude name="**/*_PSVita.csproj" /> <exclude name="**/*_PSVita.csproj" />
<exclude name="**/*_WindowsMetro.csproj" /> <exclude name="**/*_WindowsMetro.csproj" />