fixed up setup ui

diff --git a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.sln b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.sln
deleted file mode 100644 (file)
index 489d41c..0000000
--- a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.sln
+++ /dev/null
@@ -1,32 +0,0 @@
-\r
-Microsoft Visual Studio Solution File, Format Version 11.00\r
-# Visual Studio 2010\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pax-britannica-iosmonotouch", "pax-britannica-iosmonotouch\pax-britannica-iosmonotouch.csproj", "{3E4B1624-9CE0-4320-BADD-215CB9585C9B}"\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug|iPhoneSimulator = Debug|iPhoneSimulator\r
-               Release|iPhoneSimulator = Release|iPhoneSimulator\r
-               Debug|iPhone = Debug|iPhone\r
-               Release|iPhone = Release|iPhone\r
-               Ad-Hoc|iPhone = Ad-Hoc|iPhone\r
-               AppStore|iPhone = AppStore|iPhone\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.AppStore|iPhone.ActiveCfg = AppStore|iPhone\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.AppStore|iPhone.Build.0 = AppStore|iPhone\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.Debug|iPhone.ActiveCfg = Debug|iPhone\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.Debug|iPhone.Build.0 = Debug|iPhone\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.Release|iPhone.ActiveCfg = Release|iPhone\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.Release|iPhone.Build.0 = Release|iPhone\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator\r
-               {3E4B1624-9CE0-4320-BADD-215CB9585C9B}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator\r
-       EndGlobalSection\r
-       GlobalSection(MonoDevelopProperties) = preSolution\r
-               StartupItem = pax-britannica-iosmonotouch\pax-britannica-iosmonotouch.csproj\r
-       EndGlobalSection\r
-EndGlobal\r

diff --git a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.userprefs b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.userprefs
deleted file mode 100644 (file)
index 7bdfd0e..0000000
--- a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.userprefs
+++ /dev/null
@@ -1,29 +0,0 @@
-<Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.IPhone.5.0" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="pax-britannica-iosmonotouch/Main.cs">
-    <Files>
-      <File FileName="pax-britannica-iosmonotouch/Main.cs" Line="8" Column="7" />
-      <File FileName="../pax-britannica/src/de/swagner/paxbritannica/GameScreen.java" Line="1" Column="1" />
-      <File FileName="../../../gdx/src/com/badlogic/gdx/files/FileHandle.java" Line="1" Column="1" />
-      <File FileName="../../../gdx/src/com/badlogic/gdx/graphics/g2d/BitmapFont.java" Line="1" Column="1" />
-      <File FileName="../pax-britannica/src/de/swagner/paxbritannica/settings/Settings.java" Line="1" Column="1" />
-      <File FileName="../../../gdx/src/com/badlogic/gdx/Game.java" Line="1" Column="1" />
-    </Files>
-    <Pads>
-      <Pad Id="ProjectPad">
-        <State expanded="True">
-          <Node name="pax-britannica-iosmonotouch" expanded="True">
-            <Node name="References" expanded="True" />
-            <Node name="Main.cs" selected="True" />
-          </Node>
-        </State>
-      </Pad>
-    </Pads>
-  </MonoDevelop.Ide.Workbench>
-  <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore>
-      <Breakpoint file="/Users/badlogic/workspace/libgdx-git/backends/gdx-backend-iosmonotouch/Test.java" line="3" column="1" />
-    </BreakpointStore>
-  </MonoDevelop.Ide.DebuggingService.Breakpoints>
-  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-</Properties>
\ No newline at end of file

diff --git a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/Info.plist b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/Info.plist
deleted file mode 100644 (file)
index 6d7e08f..0000000
--- a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/Info.plist
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>MinimumOSVersion</key>
-       <string>3.2</string>
-       <key>UIDeviceFamily</key>
-       <array>
-               <integer>1</integer>
-               <integer>2</integer>
-       </array>
-       <key>UIStatusBarHidden</key>
-       <true/>
-       <key>UISupportedInterfaceOrientations</key>
-       <array>
-               <string>UIInterfaceOrientationLandscapeLeft</string>
-               <string>UIInterfaceOrientationLandscapeRight</string>
-       </array>
-       <key>UISupportedInterfaceOrientations~ipad</key>
-       <array>
-               <string>UIInterfaceOrientationLandscapeLeft</string>
-               <string>UIInterfaceOrientationLandscapeRight</string>
-       </array>
-</dict>
-</plist>

diff --git a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/Main.cs b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/Main.cs
deleted file mode 100644 (file)
index 19822f2..0000000
--- a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/Main.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-using com.badlogic.gdx.backends.ios;
-using de.swagner.paxbritannica;
-
-namespace paxbritannicaiosmonotouch
-{
-       public class Application
-       {
-               [Register ("AppDelegate")]
-               public partial class AppDelegate : IOSApplication {
-                       public AppDelegate(): base(new PaxBritannica(), getConfig()) {
-                               
-                       }
-                       
-                       internal static IOSApplicationConfiguration getConfig() {
-                               IOSApplicationConfiguration config = new IOSApplicationConfiguration();
-                               config.orientationLandscape = true;
-                               config.orientationPortrait = false;
-                               config.useAccelerometer = true;
-                               return config;
-                       }
-               }
-
-               static void Main (string[] args)
-               {
-                       UIApplication.Main (args, null, "AppDelegate");
-               }
-       }
-}

diff --git a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/convert.properties b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/convert.properties
deleted file mode 100644 (file)
index 0dc6846..0000000
--- a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/convert.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-SRC =       ../../pax-britannica/src/
-CLASSPATH = ../../../../gdx/bin
-EXCLUDE   = **/*Desktop.java
-IN        = -r:../../../../gdx/libs/ios32/gdx.dll -recurse:target/*.class
-OUT       = paxbritannica.dll
-

diff --git a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/convert.xml b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/convert.xml
deleted file mode 100644 (file)
index 8848391..0000000
--- a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/convert.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project name="gdx" default="convert" basedir=".">
-       <property environment="env"/>
-       <property file="convert.properties" />
-       <property name="IKVM_HOME" value="../../../../backends/gdx-backend-iosmonotouch/libs/ikvm"/>
-       <property name="MONO_HOME" value="/Developer/MonoTouch/usr/lib/mono/2.1"/>
-
-       <target name="compile">
-               <delete dir="target"/>
-               <mkdir dir="target"/>
-               <javac srcdir="${SRC}" debug="on" source="1.6" target="1.6" destdir="target" classpath="${CLASSPATH}">
-                       <include name="**/*.java"/>
-                       <exclude name="${EXCLUDE}"/>
-               </javac>
-       </target>
-
-       <target name="convert" depends="compile">
-               <exec executable="mono">
-                       <arg value="${IKVM_HOME}/bin/ikvmc.exe"/>
-                       <arg value="-nostdlib"/>
-                       <arg value="-target:library"/>
-                       <arg value="-debug"/>
-                       <arg value="-srcpath:${SRC}"/>
-                       <arg value="-out:${OUT}"/>
-                       <arg value="-r:${MONO_HOME}/mscorlib.dll"/>
-                       <arg value="-r:${MONO_HOME}/System.dll"/>
-                       <arg value="-r:${MONO_HOME}/System.Core.dll"/>
-                       <arg value="-r:${MONO_HOME}/System.Data.dll"/>
-                       <arg value="-r:${MONO_HOME}/OpenTK.dll"/>
-                       <arg value="-r:${MONO_HOME}/monotouch.dll"/>
-                       <arg value="-r:${MONO_HOME}/Mono.Data.Sqlite.dll"/>
-                       <arg line="${IN}"/>
-               </exec>
-       </target>
-</project>

diff --git a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.csproj b/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.csproj
deleted file mode 100644 (file)
index a5fd929..0000000
--- a/demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch.csproj
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3E4B1624-9CE0-4320-BADD-215CB9585C9B}</ProjectGuid>
-    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>paxbritannicaiosmonotouch</RootNamespace>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>paxbritannicaiosmonotouch</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <MtouchDebug>True</MtouchDebug>
-    <MtouchLink>None</MtouchLink>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="BeforeBuild" command="ant -v -f convert.xml" workingdir="${ProjectDir}" />
-      </CustomCommands>
-    </CustomCommands>
-    <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
-    <MtouchI18n>west</MtouchI18n>
-    <MtouchArch>ARMv7</MtouchArch>
-    <OptimizePNGs>false</OptimizePNGs>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <MtouchLink>None</MtouchLink>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="BeforeBuild" command="ant -v -f convert.xml" workingdir="${ProjectDir}" />
-      </CustomCommands>
-    </CustomCommands>
-    <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
-    <MtouchI18n>west</MtouchI18n>
-    <MtouchArch>ARMv7</MtouchArch>
-    <OptimizePNGs>false</OptimizePNGs>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchDebug>True</MtouchDebug>
-    <MtouchProfiling>True</MtouchProfiling>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="BeforeBuild" command="ant -v -f convert.xml" workingdir="${ProjectDir}" />
-      </CustomCommands>
-    </CustomCommands>
-    <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
-    <MtouchI18n>west</MtouchI18n>
-    <MtouchArch>ARMv7</MtouchArch>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <OptimizePNGs>false</OptimizePNGs>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\iPhone\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <CustomCommands>
-      <CustomCommands>
-        <Command type="BeforeBuild" command="ant -v -f convert.xml" workingdir="${ProjectDir}" />
-      </CustomCommands>
-    </CustomCommands>
-    <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <MtouchI18n>west</MtouchI18n>
-    <MtouchArch>ARMv7</MtouchArch>
-    <OptimizePNGs>false</OptimizePNGs>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <BuildIpa>True</BuildIpa>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\iPhone\AppStore</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="monotouch" />
-    <Reference Include="gdx">
-      <HintPath>..\..\..\..\gdx\libs\ios32\gdx.dll</HintPath>
-    </Reference>
-    <Reference Include="gdx-backend-ios">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ios32\gdx-backend-ios.dll</HintPath>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="IKVM.OpenJDK.Beans">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\IKVM.OpenJDK.Beans.dll</HintPath>
-    </Reference>
-    <Reference Include="IKVM.OpenJDK.Charsets">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\IKVM.OpenJDK.Charsets.dll</HintPath>
-    </Reference>
-    <Reference Include="IKVM.OpenJDK.Core">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\IKVM.OpenJDK.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="IKVM.OpenJDK.Misc">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\IKVM.OpenJDK.Misc.dll</HintPath>
-    </Reference>
-    <Reference Include="IKVM.OpenJDK.Text">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\IKVM.OpenJDK.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="IKVM.OpenJDK.Util">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\IKVM.OpenJDK.Util.dll</HintPath>
-    </Reference>
-    <Reference Include="IKVM.Reflection">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\IKVM.Reflection.dll</HintPath>
-    </Reference>
-    <Reference Include="IKVM.Runtime.JNI">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\IKVM.Runtime.JNI.dll</HintPath>
-    </Reference>
-    <Reference Include="IKVM.Runtime">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\IKVM.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="paxbritannica">
-      <HintPath>paxbritannica.dll</HintPath>
-    </Reference>
-    <Reference Include="libObjectAL">
-      <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\objectal\libObjectAL.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Info.plist" />
-    <None Include="libgdx.a" />
-    <None Include="libikvm-natives.a" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Folder Include="data\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\pax-britannica-android\assets\data\spritepack\credits.png">
-      <Link>data\spritepack\credits.png</Link>
-    </Content>
-    <Content Include="..\..\pax-britannica-android\assets\data\spritepack\singleSprites1.png">
-      <Link>data\spritepack\singleSprites1.png</Link>
-    </Content>
-    <Content Include="..\..\pax-britannica-android\assets\data\spritepack\sprites1.png">
-      <Link>data\spritepack\sprites1.png</Link>
-    </Content>
-    <Content Include="..\..\pax-britannica-android\assets\data\spritepack\sprites2.png">
-      <Link>data\spritepack\sprites2.png</Link>
-    </Content>
-    <Content Include="..\..\pax-britannica-android\assets\data\spritepack\title.png">
-      <Link>data\spritepack\title.png</Link>
-    </Content>
-    <Content Include="..\..\pax-britannica-android\assets\data\spritepack\pack.pack">
-      <Link>data\spritepack\pack.pack</Link>
-    </Content>
-    <Content Include="..\..\pax-britannica-android\assets\data\spritepack\packhigh.pack">
-      <Link>data\spritepack\packhigh.pack</Link>
-    </Content>
-    <Content Include="..\..\pax-britannica-android\assets\data\audio\music.mp3">
-      <Link>data\audio\music.mp3</Link>
-    </Content>
-  </ItemGroup>
-</Project>
\ No newline at end of file

diff --git a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/BaseProjectConfiguration.java b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/BaseProjectConfiguration.java
index c8f8e44..a374a6d 100644 (file)
--- a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/BaseProjectConfiguration.java
+++ b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/BaseProjectConfiguration.java
@@ -33,7 +33,6 @@ public abstract class BaseProjectConfiguration {
        public String suffixCommon = "";
        public String suffixDesktop = "-desktop";
        public String suffixAndroid = "-android";
-       public String suffixIos = "-ios";
        public String suffixRobovm = "-robovm";
        public String suffixHtml = "-html";
 

diff --git a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/Helper.java b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/Helper.java
index 1c2a37e..19e8e9e 100644 (file)
--- a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/Helper.java
+++ b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/Helper.java
@@ -15,17 +15,20 @@
  ******************************************************************************/
 package aurelienribon.gdxsetupui;
 
-import aurelienribon.utils.XmlUtils;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.xml.xpath.XPathConstants;
+
 import org.apache.commons.io.FilenameUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import aurelienribon.utils.XmlUtils;
+
 /**
  * @author Aurelien Ribon | http://www.aurelienribon.com/
  */
@@ -66,11 +69,7 @@ public class Helper {
                return FilenameUtils.normalize(cfg.destinationPath + "/" + cfg.projectName + cfg.suffixHtml + "/", true);
        }
        
-       public static String getIosPrjPath (ProjectUpdateConfiguration cfg) {
-               return FilenameUtils.normalize(cfg.destinationPath + "/" + cfg.projectName + cfg.suffixIos + "/", true);
-       }
-       
-       public static String getRobovomPrjPath (ProjectUpdateConfiguration cfg) {
+       public static String getRobovmPrjPath (ProjectUpdateConfiguration cfg) {
                return FilenameUtils.normalize(cfg.destinationPath + "/" + cfg.projectName + cfg.suffixRobovm + "/", true);
        }
 

diff --git a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/LibraryDef.java b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/LibraryDef.java
index 52a6e58..876aa9c 100644 (file)
--- a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/LibraryDef.java
+++ b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/LibraryDef.java
@@ -37,7 +37,6 @@ public class LibraryDef {
        public final List<String> libsDesktop;
        public final List<String> libsAndroid;
        public final List<String> libsHtml;
-       public final List<String> libsIos;
        public final List<String> libsRobovm;
        public final List<String> data;
 
@@ -60,7 +59,6 @@ public class LibraryDef {
                this.libsDesktop = ParseUtils.parseBlockAsList(content, "libs-desktop");
                this.libsAndroid = ParseUtils.parseBlockAsList(content, "libs-android");
                this.libsHtml = ParseUtils.parseBlockAsList(content, "libs-html");
-               this.libsIos = ParseUtils.parseBlockAsList(content, "libs-ios");
                this.libsRobovm = ParseUtils.parseBlockAsList(content, "libs-robovm");
                this.data = ParseUtils.parseBlockAsList(content, "data");
        }

diff --git a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ProjectSetup.java b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ProjectSetup.java
index 092670f..8b232cc 100644 (file)
--- a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ProjectSetup.java
+++ b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ProjectSetup.java
@@ -78,10 +78,7 @@ public class ProjectSetup {
                if (cfg.isDesktopIncluded) templateManager.define("PRJ_DESKTOP_NAME", cfg.projectName + cfg.suffixDesktop);
                if (cfg.isAndroidIncluded) templateManager.define("PRJ_ANDROID_NAME", cfg.projectName + cfg.suffixAndroid);
                if (cfg.isHtmlIncluded) templateManager.define("PRJ_HTML_NAME", cfg.projectName + cfg.suffixHtml);
-               if (cfg.isIosIncluded) {
-                       templateManager.define("PRJ_IOS_NAME", cfg.projectName + cfg.suffixIos);
-                       templateManager.define("PRJ_ROBOVM_NAME", cfg.projectName + cfg.suffixRobovm);
-               }
+               if (cfg.isIosIncluded) templateManager.define("PRJ_ROBOVM_NAME", cfg.projectName + cfg.suffixRobovm);
 
                // Android manifest definitions
                if (!cfg.androidMinSdkVersion.equals("")) templateManager.define("ANDROID_MIN_SDK", cfg.androidMinSdkVersion);
@@ -156,8 +153,6 @@ public class ProjectSetup {
                                        if (entryName.endsWith(elemName)) copyEntry(new ByteArrayInputStream(bytes), elemName, androidPrjLibsDir);
                                for (String elemName : def.libsHtml)
                                        if (entryName.endsWith(elemName)) copyEntry(new ByteArrayInputStream(bytes), elemName, htmlPrjLibsDir);
-                               for (String elemName : def.libsIos)
-                                       if(entryName.endsWith(elemName)) copyEntry(new ByteArrayInputStream(bytes), elemName, iosPrjLibsDir);
                                for (String elemName : def.libsRobovm)
                                        if(entryName.endsWith(elemName)) copyEntry(new ByteArrayInputStream(bytes), elemName, robovmPrjLibsDir);
                                for (String elemName : def.data)
@@ -275,15 +270,8 @@ public class ProjectSetup {
                }
                
                if(cfg.isIosIncluded) {
-                       File src = new File(tmpDst, "prj-ios");
-                       File dst = new File(tmpDst, cfg.projectName + cfg.suffixIos);
-                       move(src, "my-gdx-game-ios.csproj", cfg.projectName + cfg.suffixIos + ".csproj");
-                       move(src, "my-gdx-game-ios.sln", cfg.projectName + cfg.suffixIos + ".sln");
-                       templateDir(src);
-                       FileUtils.moveDirectory(src, dst);
-                       
-                       src = new File(tmpDst, "prj-robovm");
-                       dst = new File(tmpDst, cfg.projectName + cfg.suffixRobovm);
+                       File src = new File(tmpDst, "prj-robovm");
+                       File dst = new File(tmpDst, cfg.projectName + cfg.suffixRobovm);
                        move(src, "src/RobovmLauncher.java", "src/" + cfg.packageName.replace('.', '/') + "/RobovmLauncher.java");
                        templateDir(src);
                        FileUtils.moveDirectory(src, dst);
@@ -315,9 +303,6 @@ public class ProjectSetup {
                }
                
                if(cfg.isIosIncluded) {
-                       src = new File(tmpDst, cfg.projectName + cfg.suffixIos);
-                       FileUtils.copyDirectoryToDirectory(src, dst);
-                       
                        src = new File(tmpDst, cfg.projectName + cfg.suffixRobovm);
                        FileUtils.copyDirectoryToDirectory(src, dst);
                }

diff --git a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ProjectUpdate.java b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ProjectUpdate.java
index ff2730b..d4d35b2 100644 (file)
--- a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ProjectUpdate.java
+++ b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ProjectUpdate.java
@@ -67,7 +67,7 @@ public class ProjectUpdate {
                File desktopPrjLibsDir = new File(Helper.getDesktopPrjPath(cfg) + "libs");
                File androidPrjLibsDir = new File(Helper.getAndroidPrjPath(cfg) + "libs");
                File htmlPrjLibsDir = new File(Helper.getHtmlPrjPath(cfg) + "war/WEB-INF/lib");
-               File iosPrjLibsDir = new File(Helper.getIosPrjPath(cfg) + "libs");
+               File robovmPrjLibsDir = new File(Helper.getRobovmPrjPath(cfg) + "libs");
                File dataDir = new File(Helper.getAndroidPrjPath(cfg) + "assets");
 
                for (String library : cfg.libraries) {
@@ -102,8 +102,8 @@ public class ProjectUpdate {
                                }
                                
                                if(cfg.isIosIncluded) {
-                                       for(String elemName : def.libsIos)
-                                               if (entryName.endsWith(elemName)) copyEntry(zis, elemName, iosPrjLibsDir);
+                                       for(String elemName : def.libsRobovm)
+                                               if (entryName.endsWith(elemName)) copyEntry(zis, elemName, robovmPrjLibsDir);
                                }
                        }
 

diff --git a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ui/panels/AdvancedSettingsPanel.java b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ui/panels/AdvancedSettingsPanel.java
index 64c7ce6..18604d3 100644 (file)
--- a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ui/panels/AdvancedSettingsPanel.java
+++ b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ui/panels/AdvancedSettingsPanel.java
@@ -36,7 +36,7 @@ public class AdvancedSettingsPanel extends javax.swing.JPanel {
                desktopSuffixField.setText(Ctx.cfgSetup.suffixDesktop);
                androidSuffixField.setText(Ctx.cfgSetup.suffixAndroid);
                htmlSuffixField.setText(Ctx.cfgSetup.suffixHtml);
-      iosSuffixField.setText(Ctx.cfgSetup.suffixIos);
+      iosSuffixField.setText(Ctx.cfgSetup.suffixRobovm);
                androidMinSdkField.setText(Ctx.cfgSetup.androidMinSdkVersion);
                androidTargetSdkField.setText(Ctx.cfgSetup.androidTargetSdkVersion);
                androidMaxSdkField.setText(Ctx.cfgSetup.androidMaxSdkVersion);
@@ -62,7 +62,7 @@ public class AdvancedSettingsPanel extends javax.swing.JPanel {
                Ctx.cfgSetup.suffixCommon = coreSuffixField.getText();
                Ctx.cfgSetup.suffixDesktop = desktopSuffixField.getText();
                Ctx.cfgSetup.suffixAndroid = androidSuffixField.getText();
-                Ctx.cfgSetup.suffixIos = iosSuffixField.getText();
+               Ctx.cfgSetup.suffixRobovm = iosSuffixField.getText();
                Ctx.cfgSetup.androidMinSdkVersion = androidMinSdkField.getText();
                Ctx.cfgSetup.androidMaxSdkVersion = androidMaxSdkField.getText();
                Ctx.cfgSetup.androidTargetSdkVersion = androidTargetSdkField.getText();
@@ -70,7 +70,7 @@ public class AdvancedSettingsPanel extends javax.swing.JPanel {
                Ctx.cfgUpdate.suffixCommon = coreSuffixField.getText();
                Ctx.cfgUpdate.suffixDesktop = desktopSuffixField.getText();
                Ctx.cfgUpdate.suffixAndroid = androidSuffixField.getText();
-                Ctx.cfgUpdate.suffixIos = iosSuffixField.getText();
+      Ctx.cfgUpdate.suffixRobovm = iosSuffixField.getText();
                Ctx.fireCfgSetupChanged();
        }
 

diff --git a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ui/panels/PreviewPanel.java b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ui/panels/PreviewPanel.java
index 06461b6..6950598 100644 (file)
--- a/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ui/panels/PreviewPanel.java
+++ b/extensions/gdx-setup-ui/src/aurelienribon/gdxsetupui/ui/panels/PreviewPanel.java
@@ -246,7 +246,6 @@ public class PreviewPanel extends javax.swing.JPanel {
                                for (String path : def.libsDesktop) pathToNodes(path, desktopLibsNode);
                                for (String path : def.libsAndroid) pathToNodes(path, androidLibsNode);
                                for (String path : def.libsHtml) pathToNodes(path, htmlLibsNode);
-                               for (String path : def.libsIos) pathToNodes(path, iosLibsNode);
                                for (String path : def.libsRobovm) pathToNodes(path, robovmLibsNode);
                                for (String path : def.data) pathToNodes(path, dataNode);                              
                        }
@@ -291,7 +290,6 @@ public class PreviewPanel extends javax.swing.JPanel {
                                        if (isDir && name.equals("prj-desktop")) name = Ctx.cfgSetup.projectName + Ctx.cfgSetup.suffixDesktop;
                                        if (isDir && name.equals("prj-android")) name = Ctx.cfgSetup.projectName + Ctx.cfgSetup.suffixAndroid;
                                        if (isDir && name.equals("prj-html")) name = Ctx.cfgSetup.projectName + Ctx.cfgSetup.suffixHtml;
-                                       if (isDir && name.equals("prj-ios")) name = Ctx.cfgSetup.projectName + Ctx.cfgSetup.suffixIos;
                                        if (isDir && name.equals("prj-robovm")) name = Ctx.cfgSetup.projectName + Ctx.cfgSetup.suffixRobovm;
 
                                        label.setText(FilenameUtils.getName(name));

diff --git a/fetch.xml b/fetch.xml
index 02d47d0..ab8a54c 100755 (executable)
--- a/fetch.xml
+++ b/fetch.xml
@@ -27,17 +27,8 @@
                <get src="${domain}/armeabi/libgdx.so" dest="tmp/armeabi"/>\r
                <get src="${domain}/armeabi-v7a/libgdx.so" dest="tmp/armeabi-v7a"/>\r
         <get src="${domain}/x86/libgdx.so" dest="tmp/x86"/>\r
-               <get src="${domain}/ios/gdx.dll" dest="gdx/libs/ios32"/>\r
-               <get src="${domain}/ios/gdx.dll.mdb" dest="gdx/libs/ios32"/>\r
         <get src="${domain}/ios/libgdx.a" dest="gdx/libs/ios32"/>\r
         <get src="${domain}/ios/libObjectAL.a" dest="gdx/libs/ios32"/>\r
-               <get src="${domain}/ios/libgdx.a" dest="tmp/ios"/>\r
-               <get src="${domain}/ios/ikvm/bin/libikvm-natives.a" dest="tmp/ios"/>\r
-               \r
-               <!-- ios backend -->\r
-               <mkdir dir="backends/gdx-backend-iosmonotouch/libs/ios32"/>\r
-               <get src="${domain}/ios/gdx-backend-ios.dll" dest="backends/gdx-backend-iosmonotouch/libs/ios32"/>\r
-               <get src="${domain}/ios/gdx-backend-ios.dll.mdb" dest="backends/gdx-backend-iosmonotouch/libs/ios32"/>\r
                \r
         <!-- robovm snapshot jars for robovm backend -->\r
         <antcall target="fetch-robovm"/>\r
@@ -66,10 +57,7 @@
                <get src="${domain}/extensions/gdx-freetype/armeabi/libgdx-freetype.so" dest="tmp/armeabi"/>\r
                <get src="${domain}/extensions/gdx-freetype/armeabi-v7a/libgdx-freetype.so" dest="tmp/armeabi-v7a"/>\r
         <get src="${domain}/extensions/gdx-freetype/x86/libgdx-freetype.so" dest="tmp/x86"/>\r
-               <get src="${domain}/extensions/gdx-freetype/ios/gdx-freetype.dll" dest="extensions/gdx-freetype/libs/ios32"/>\r
-               <get src="${domain}/extensions/gdx-freetype/ios/gdx-freetype.dll.mdb" dest="extensions/gdx-freetype/libs/ios32"/>\r
         <get src="${domain}/extensions/gdx-freetype/ios/libgdx-freetype.a" dest="extensions/gdx-freetype/libs/ios32"/>\r
-               <get src="${domain}/extensions/gdx-freetype/ios/libgdx-freetype.a" dest="tmp/ios"/>\r
                \r
                <!-- image natives -->\r
                <mkdir dir="extensions/gdx-image/libs/ios32"/>\r
@@ -95,11 +83,6 @@
         <copy todir="tests/gdx-tests-android/libs/x86">\r
                        <fileset dir="tmp/x86"/>\r
                </copy>\r
-               \r
-               <!-- copy all extension natives to ios tests -->\r
-               <copy todir="tests/gdx-tests-iosmonotouch/gdx-tests-iosmonotouch">\r
-                       <fileset dir="tmp/ios"/>\r
-               </copy>\r
        \r
                <!-- filesets to copy to demos -->\r
                <fileset id="gdx-armeabi" dir="tmp/armeabi">\r
@@ -111,29 +94,22 @@
         <fileset id="gdx-x86" dir="tmp/x86">\r
                        <include name="**/libgdx.so"/>\r
                </fileset>\r
-               <fileset id="gdx-ios" dir="tmp/ios">\r
-                       <include name="**/libgdx.a"/>\r
-                       <include name="**/libikvm-natives.a"/>\r
-               </fileset>\r
                \r
                <!-- copy to demos -->\r
                <!-- invaders -->\r
                <copy todir="demos/invaders/gdx-invaders-android/libs/armeabi"><fileset refid="gdx-armeabi"/></copy>\r
                <copy todir="demos/invaders/gdx-invaders-android/libs/armeabi-v7a"><fileset refid="gdx-armeabi-v7a"/></copy>\r
         <copy todir="demos/invaders/gdx-invaders-android/libs/x86"><fileset refid="gdx-x86"/></copy>\r
-               <copy todir="demos/invaders/gdx-invaders-ios/gdx-invaders-ios"><fileset refid="gdx-ios"/></copy>\r
                                \r
                <!-- vector pinball -->\r
                <copy todir="demos/vector-pinball/gdx-vectorpinball-android/libs/armeabi"><fileset refid="gdx-armeabi"/></copy>\r
                <copy todir="demos/vector-pinball/gdx-vectorpinball-android/libs/armeabi-v7a"><fileset refid="gdx-armeabi-v7a"/></copy>\r
                <copy todir="demos/vector-pinball/gdx-vectorpinball-android/libs/x86"><fileset refid="gdx-x86"/></copy>\r
-               <copy todir="demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios"><fileset refid="gdx-ios"/></copy>\r
                \r
                <!-- super jumper -->\r
                <copy todir="demos/superjumper/superjumper-android/libs/armeabi"><fileset refid="gdx-armeabi"/></copy>\r
                <copy todir="demos/superjumper/superjumper-android/libs/armeabi-v7a"><fileset refid="gdx-armeabi-v7a"/></copy>\r
         <copy todir="demos/superjumper/superjumper-android/libs/x86"><fileset refid="gdx-x86"/></copy>\r
-               <copy todir="demos/superjumper/superjumper-ios/superjumper-ios"><fileset refid="gdx-ios"/></copy>\r
                \r
                <!-- metagun -->\r
                <copy todir="demos/metagun/metagun-android/libs/armeabi"><fileset refid="gdx-armeabi"/></copy>\r
@@ -149,7 +125,6 @@
                <copy todir="demos/pax-britannica/pax-britannica-android/libs/armeabi"><fileset refid="gdx-armeabi"/></copy>\r
                <copy todir="demos/pax-britannica/pax-britannica-android/libs/armeabi-v7a"><fileset refid="gdx-armeabi-v7a"/></copy>\r
         <copy todir="demos/pax-britannica/pax-britannica-android/libs/x86"><fileset refid="gdx-x86"/></copy>\r
-               <copy todir="demos/pax-britannica/pax-britannica-iosmonotouch/pax-britannica-iosmonotouch"><fileset refid="gdx-ios"/></copy>\r
                \r
                <!-- very angry robots -->\r
                <copy todir="demos/very-angry-robots/very-angry-robots-android/libs/armeabi"><fileset refid="gdx-armeabi"/></copy>\r