OSDN Git Service

fixed gdx-vectorpinball-ios, box2d works like a charme as well on ios :D
authorbadlogic <contact@badlogicgames.com>
Tue, 9 Oct 2012 13:17:26 +0000 (15:17 +0200)
committerbadlogic <contact@badlogicgames.com>
Tue, 9 Oct 2012 13:17:26 +0000 (15:17 +0200)
demos/invaders/gdx-invaders-ios/gdx-invaders-ios.userprefs
demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.sln
demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios.userprefs
demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios/Info.plist
demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios/Main.cs
demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios/gdx-vectorpinball-ios.csproj
demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios/libgdx.a

index 66af75b..e3bbaf3 100644 (file)
@@ -1,5 +1,5 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
   <MonoDevelop.Ide.Workbench ActiveDocument="gdx-invaders-ios/Main.cs">
     <Files>
       <File FileName="gdx-invaders-ios/Main.cs" Line="9" Column="24" />
index 3474828..807f323 100644 (file)
@@ -1,7 +1,7 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 11.00\r
 # Visual Studio 2010\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gdx-vectorpinball-ios", "gdx-vectorpinball-ios\gdx-vectorpinball-ios.csproj", "{E9434FE8-789E-4EF9-AD1E-40F73DBA497B}"\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gdx-vectorpinball-ios", "gdx-vectorpinball-ios\gdx-vectorpinball-ios.csproj", "{3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
@@ -13,18 +13,18 @@ Global
                AppStore|iPhone = AppStore|iPhone\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.AppStore|iPhone.ActiveCfg = AppStore|iPhone\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.AppStore|iPhone.Build.0 = AppStore|iPhone\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Debug|iPhone.ActiveCfg = Debug|iPhone\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Debug|iPhone.Build.0 = Debug|iPhone\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Release|iPhone.ActiveCfg = Release|iPhone\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Release|iPhone.Build.0 = Release|iPhone\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator\r
-               {E9434FE8-789E-4EF9-AD1E-40F73DBA497B}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.AppStore|iPhone.ActiveCfg = AppStore|iPhone\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.AppStore|iPhone.Build.0 = AppStore|iPhone\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.Debug|iPhone.ActiveCfg = Debug|iPhone\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.Debug|iPhone.Build.0 = Debug|iPhone\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.Release|iPhone.ActiveCfg = Release|iPhone\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.Release|iPhone.Build.0 = Release|iPhone\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator\r
+               {3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator\r
        EndGlobalSection\r
        GlobalSection(MonoDevelopProperties) = preSolution\r
                StartupItem = gdx-vectorpinball-ios\gdx-vectorpinball-ios.csproj\r
index e1ac9fe..c9e1725 100644 (file)
@@ -1,8 +1,9 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
   <MonoDevelop.Ide.Workbench ActiveDocument="gdx-vectorpinball-ios/Main.cs">
     <Files>
-      <File FileName="gdx-vectorpinball-ios/Main.cs" Line="8" Column="11" />
+      <File FileName="gdx-vectorpinball-ios/Main.cs" Line="25" Column="18" />
+      <File FileName="gdx-vectorpinball-ios/Info.plist" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
index 53c0eb4..33b6623 100644 (file)
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-       <key>CFBundleDisplayName</key>
-       <string>vectorpinpall</string>
        <key>MinimumOSVersion</key>
        <string>3.2</string>
        <key>UIDeviceFamily</key>
index cb2a8b8..3d2b079 100644 (file)
@@ -13,10 +13,17 @@ namespace bouncy
        {
                [Register ("AppDelegate")]
                public partial class AppDelegate : IOSApplication {
-                       public AppDelegate(): base(new Bouncy(), new IOSApplicationConfiguration()) {
+                       public AppDelegate(): base(new Bouncy(), getConfig()) {
                                
                        }
                }
+
+               internal static IOSApplicationConfiguration getConfig() {
+                       IOSApplicationConfiguration config = new IOSApplicationConfiguration();
+                       config.orientationLandscape = false;
+                       config.orientationPortrait = true;
+                       return config;
+               }
                
                static void Main (string[] args)
                {
index 3547711..8f7ed26 100644 (file)
@@ -5,10 +5,12 @@
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E9434FE8-789E-4EF9-AD1E-40F73DBA497B}</ProjectGuid>
+    <ProjectGuid>{3D6A15CB-C4D0-4F6D-B152-EBF9D66064E5}</ProjectGuid>
     <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
-    <RootNamespace>vectorpinball</RootNamespace>
+    <RootNamespace>gdxvectorpinballios</RootNamespace>
+    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
+    <AssemblyName>gdxvectorpinballios</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>True</DebugSymbols>
     <MtouchDebug>True</MtouchDebug>
     <MtouchProfiling>True</MtouchProfiling>
     <MtouchLink>None</MtouchLink>
-    <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>
     <CustomCommands>
       <CustomCommands>
         <Command type="BeforeBuild" command="ant -f convert.xml compile convert -DSRC=&quot;../../gdx-vectorpinball/src/&quot; -DCLASSPATH=&quot;../../../../gdx/bin/;../../../../backends/gdx-backend-lwjgl/bin&quot; -DIN=&quot;-r:../../../../backends/gdx-backend-iosmonotouch/libs/gdx.dll -recurse:target/*.class&quot;  -DOUT=&quot;vectorpinball.dll&quot; -DEXCLUDE=&quot;**/BouncyDesktop.java&quot; -v" workingdir="${ProjectDir}" />
       </CustomCommands>
     </CustomCommands>
-    <AssemblyName>vectorpinball</AssemblyName>
+    <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>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <MtouchLink>None</MtouchLink>
-    <MtouchExtraArgs>-nosymbolstrip -nostrip -cxx -gcc_flags "-L${ProjectDir} -likvm-natives -lgdx -force_load ${ProjectDir}/libgdx.a -force_load ${ProjectDir}/libikvm-natives.a"</MtouchExtraArgs>
-    <MtouchI18n>
-    </MtouchI18n>
-    <MtouchUseLlvm>True</MtouchUseLlvm>
     <CustomCommands>
       <CustomCommands>
         <Command type="BeforeBuild" command="ant -f convert.xml compile convert -DSRC=&quot;../../gdx-vectorpinball/src/&quot; -DCLASSPATH=&quot;../../../../gdx/bin/;../../../../backends/gdx-backend-lwjgl/bin&quot; -DIN=&quot;-r:../../../../backends/gdx-backend-iosmonotouch/libs/gdx.dll -recurse:target/*.class&quot;  -DOUT=&quot;vectorpinball.dll&quot; -DEXCLUDE=&quot;**/BouncyDesktop.java&quot; -v" workingdir="${ProjectDir}" />
       </CustomCommands>
     </CustomCommands>
-    <AssemblyName>vectorpinball</AssemblyName>
+    <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>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>True</DebugSymbols>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>True</MtouchDebug>
     <MtouchProfiling>True</MtouchProfiling>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="BeforeBuild" command="ant -f convert.xml compile convert -DSRC=&quot;../../gdx-vectorpinball/src/&quot; -DCLASSPATH=&quot;../../../../gdx/bin/;../../../../backends/gdx-backend-lwjgl/bin&quot; -DIN=&quot;-r:../../../../backends/gdx-backend-iosmonotouch/libs/gdx.dll -recurse:target/*.class&quot;  -DOUT=&quot;vectorpinball.dll&quot; -DEXCLUDE=&quot;**/BouncyDesktop.java&quot; -v" 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>
-    <AssemblyName>superjumperios</AssemblyName>
+    <MtouchArch>ARMv7</MtouchArch>
+    <MtouchUseSGen>True</MtouchUseSGen>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseLlvm>True</MtouchUseLlvm>
-    <IpaPackageName />
-    <MtouchI18n>west</MtouchI18n>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="BeforeBuild" command="ant -f convert.xml compile convert -DSRC=&quot;../../gdx-vectorpinball/src/&quot; -DCLASSPATH=&quot;../../../../gdx/bin/;../../../../backends/gdx-backend-lwjgl/bin&quot; -DIN=&quot;-r:../../../../backends/gdx-backend-iosmonotouch/libs/gdx.dll -recurse:target/*.class&quot;  -DOUT=&quot;vectorpinball.dll&quot; -DEXCLUDE=&quot;**/BouncyDesktop.java&quot; -v" 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>
-    <AssemblyName>superjumperios</AssemblyName>
+    <MtouchI18n>west</MtouchI18n>
     <MtouchArch>ARMv7</MtouchArch>
+    <MtouchUseSGen>True</MtouchUseSGen>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
     <DebugType>none</DebugType>
@@ -89,8 +97,6 @@
     <ConsolePause>False</ConsolePause>
     <BuildIpa>True</BuildIpa>
     <CodesignKey>iPhone Distribution</CodesignKey>
-    <MtouchI18n />
-    <AssemblyName>superjumperios</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
     <DebugType>none</DebugType>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <CodesignKey>iPhone Distribution</CodesignKey>
-    <AssemblyName>superjumperios</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="monotouch" />
+    <Reference Include="vectorpinball">
+      <HintPath>vectorpinball.dll</HintPath>
+    </Reference>
     <Reference Include="gdx">
       <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\gdx.dll</HintPath>
     </Reference>
     <Reference Include="gdx-backend-ios">
       <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\gdx-backend-ios.dll</HintPath>
     </Reference>
-    <Reference Include="vectorpinball">
-      <HintPath>vectorpinball.dll</HintPath>
-    </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <HintPath>..\..\..\..\backends\gdx-backend-iosmonotouch\libs\ikvm\bin\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />
-    <None Include="libikvm-natives.a" />
     <None Include="libgdx.a" />
+    <None Include="libikvm-natives.a" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
   <ItemGroup>
     <Content Include="..\..\gdx-vectorpinball-android\assets\data\field_layout.json">
       <Link>data\field_layout.json</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 </Project>
\ No newline at end of file
index 152c38f..79e81af 100644 (file)
Binary files a/demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios/libgdx.a and b/demos/vector-pinball/gdx-vectorpinball-ios/gdx-vectorpinball-ios/libgdx.a differ