This commit is contained in:
Kenneth Pouncey 2014-08-29 17:02:55 +02:00
Родитель 97a85ec897
Коммит 38ad5891e9
3 изменённых файлов: 25 добавлений и 20 удалений

Просмотреть файл

@ -30,12 +30,12 @@ Global
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Debug|x86.Build.0 = Debug|Any CPU
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|Any CPU.Build.0 = Release|Any CPU
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|ARM.ActiveCfg = Release|ARM
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|ARM.Build.0 = Release|ARM
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|x64.ActiveCfg = Release|x64
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|x64.Build.0 = Release|x64
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|x86.ActiveCfg = Release|x86
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|x86.Build.0 = Release|x86
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|ARM.ActiveCfg = Release|Any CPU
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|ARM.Build.0 = Release|Any CPU
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|x64.ActiveCfg = Release|Any CPU
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|x64.Build.0 = Release|Any CPU
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|x86.ActiveCfg = Release|Any CPU
{158FF52F-6E3B-498C-9C96-A4DA9FD4E6E0}.Release|x86.Build.0 = Release|Any CPU
{0518563C-ACCA-4A14-8C5D-DDBE93E2605F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0518563C-ACCA-4A14-8C5D-DDBE93E2605F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0518563C-ACCA-4A14-8C5D-DDBE93E2605F}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -59,12 +59,12 @@ Global
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|x86.Build.0 = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Any CPU.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|ARM.ActiveCfg = Release|ARM
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|ARM.Build.0 = Release|ARM
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|x64.ActiveCfg = Release|x64
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|x64.Build.0 = Release|x64
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|x86.ActiveCfg = Release|x86
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|x86.Build.0 = Release|x86
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|ARM.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|ARM.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|x64.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|x64.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|x86.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|x86.Build.0 = Release|Any CPU
{A65B8326-1DDD-4E5D-8130-E74F70919E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A65B8326-1DDD-4E5D-8130-E74F70919E81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A65B8326-1DDD-4E5D-8130-E74F70919E81}.Debug|ARM.ActiveCfg = Debug|Any CPU

Просмотреть файл

@ -75,10 +75,11 @@
<call target="buildandroid" />
<call target="buildwindows8" />
<call target="buildwindowsphone" />
<!--
<call target="buildmac" />
<call target="buildios" />
<call target="buildpsm" />
-->
<call target="buildtools"/>
<call target="buildcontentprocessor"/>
@ -188,4 +189,4 @@
</if>
</target>
</project>
</project>

Просмотреть файл

@ -20,7 +20,7 @@
</target>
<target name="clean" depends="checkos">
<delete dir="${project::get-base-directory()}\cocos2d\obj" verbose="true">
<delete dir="${project::get-base-directory()}\CocosSharp\obj" verbose="true">
</delete>
</target>
@ -30,11 +30,11 @@
<call target="buildPCL"/>
<call target="buildwindows"/>
<call target="buildwindowsphone8"/>
<call target="buildwindows8"/>
<call target="buildios"/>
<call target="buildmac"/>
<call target="buildandroid"/>
<call target="buildouya"/>
<call target="buildwindows8"/>
<call target="buildnugets"/>
@ -43,7 +43,7 @@
<target name="monogame" description="Build MonoGame Release" depends="checkos">
<if test="${os == 'Win32NT'}">
<copy file="MonoGame.build" tofile="MonoGame/default.build" overwrite="true"/>
<copy file="MonoGame.build" tofile="MonoGame/default.build" overwrite="true"/>
<nant buildfile="MonoGame/default.build" target="build" />
</if>
@ -62,8 +62,10 @@
<target name="buildwindows" description="Build Windows" depends="clean">
<if test="${os == 'Win32NT'}">
<exec program="msbuild " commandline="CocosSharp.Windows.sln /t:Clean /p:Configuration=${configuration}" />
<exec program="msbuild " commandline="CocosSharp.Windows.sln /t:Build /p:Configuration=${configuration}" />
<nant buildfile="MonoGame/default.build" target="buildwindows" />
<exec program="msbuild " commandline="CocosSharp.WindowsGL.sln /t:Clean /p:Configuration=${configuration}" />
<exec program="msbuild " commandline="CocosSharp.WindowsGL.sln /t:Build /p:Configuration=${configuration}" />
<exec program="msbuild " commandline="CocosSharp.WindowsDX.sln /t:Clean /p:Configuration=${configuration}" />
@ -80,6 +82,7 @@
<target name="buildwindowsphone8" description="Build Windows Phone 8" depends="clean">
<if test="${os == 'Win32NT'}">
<if test="${file::exists('c:\Program Files (x86)\MSBuild\Microsoft\WindowsPhone\v8.0\Microsoft.Cpp.WindowsPhone.8.0.targets') or file::exists('c:\Program Files\MSBuild\Microsoft\WindowsPhone\v8.0\Microsoft.Cpp.WindowsPhone.8.0.targets')}">
<nant buildfile="MonoGame/default.build" target="buildwindowsphone" />
<exec program="msbuild " commandline='CocosSharp.WindowsPhone.sln /t:Clean /p:Configuration=${configuration} /p:Platform="ARM"' />
<exec program="msbuild " commandline='CocosSharp.WindowsPhone.sln /t:Build /p:Configuration=${configuration} /p:Platform="ARM"' />
<exec program="msbuild " commandline='CocosSharp.WindowsPhone.sln /t:Clean /p:Configuration=${configuration} /p:Platform="x86"' />
@ -90,8 +93,9 @@
<target name="buildwindows8" description="Build Windows 8" depends="clean">
<if test="${os == 'Win32NT'}">
<nant buildfile="MonoGame/default.build" target="buildwindows8" />
<exec program="msbuild " commandline="CocosSharp.Windows8.sln /t:Clean /p:Configuration=${configuration}" />
<exec program="msbuild " commandline="CocosSharp.Windows8.sln /t:Build /p:Configuration=${configuration}" />
<exec program="msbuild " commandline="CocosSharp.Windows8.sln /t:Rebuild /p:Configuration=${configuration}" />
</if>
</target>
@ -186,9 +190,9 @@
<exec program="${nuget.cmd.dir.path} " commandline='pack "${nuspec.file.dir.path}CocosSharp.iOS.nuspec" -OutputDirectory "${packages.dir.path}"' />
<exec program="${nuget.cmd.dir.path} " commandline='pack "${nuspec.file.dir.path}CocosSharp.Android.nuspec" -OutputDirectory "${packages.dir.path}"' />
<exec program="${nuget.cmd.dir.path} " commandline='pack "${nuspec.file.dir.path}CocosSharp.Ouya.nuspec" -OutputDirectory "${packages.dir.path}"' />
<!--exec program="${nuget.cmd.dir.path} " commandline='pack "${nuspec.file.dir.path}Cocos2D.MGCB.nuspec" -OutputDirectory "${packages.dir.path}"' /-->
<exec program="${nuget.cmd.dir.path} " commandline='pack "${nuspec.file.dir.path}CocosSharp.WindowsDX.nuspec" -OutputDirectory "${packages.dir.path}"' />
<exec program="${nuget.cmd.dir.path} " commandline='pack "${nuspec.physics.file.dir.path}ChipmunkSharp.Windows.nuspec" -OutputDirectory "${packages.dir.path}" ' />
<!--exec program="${nuget.cmd.dir.path} " commandline='pack "${nuspec.file.dir.path}Cocos2D.MGCB.nuspec" -OutputDirectory "${packages.dir.path}"' /-->
<exec program="${nuget.cmd.dir.path} " commandline='pack "${nuspec.physics.file.dir.path}ChipmunkSharp.Windows.nuspec" -OutputDirectory "${packages.dir.path}" ' />
</if>
<if test="${os == 'MacOS'}">