Skip to content

Commit

Permalink
Merge pull request #20 from tuarua/2.2.0-shared
Browse files Browse the repository at this point in the history
2.2.0 shared ANE for dlls
  • Loading branch information
tuarua committed Jun 3, 2019
2 parents c9a4b32 + 1f8ea88 commit 93e413f
Show file tree
Hide file tree
Showing 56 changed files with 1,020 additions and 1,021 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@ public static class FrePoint {
### Required AS3 classes
**com.tuarua.fre.ANEUtils.as** and **com.tuarua.fre.ANEError.as** are required by FreSharp and should be included in the AS3 library of your ANE

### Required Dependencies
Starting from version 2.2.0 FreSharp.ane is required in your AIR project.
This ANE contains the required FreSharp dlls and also handles the searching for and loading of a project's C# dll when packaged inside the ANE.
No more copying these files into your AIRSDK!

### Tech

Uses .NET 4.6
Expand Down
Binary file removed framework_src/example/c_sharp_libs_x64/FreSharp.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed framework_src/example/c_sharp_libs_x86/FreSharp.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
9 changes: 9 additions & 0 deletions framework_src/example/example/.idea/libraries/FreSharpANE.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions framework_src/example/example/FreSharpExample.iml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<entry library-name="FreSharpExampleANE" library-level="project">
<dependency linkage="Merged" />
</entry>
<entry library-name="FreSharpANE" library-level="project">
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="AIRSDK_32" />
</dependencies>
Expand All @@ -26,6 +29,9 @@
<entry library-name="FreSharpExampleANE" library-level="project">
<dependency linkage="Merged" />
</entry>
<entry library-name="FreSharpANE" library-level="project">
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="AIRSDK_28_64" />
</dependencies>
Expand All @@ -51,5 +57,6 @@
<orderEntry type="library" exported="" name="FreSharpExampleANE" level="project" />
<orderEntry type="library" exported="" name="greensock" level="project" />
<orderEntry type="library" exported="" name="AIRNativeANE" level="project" />
<orderEntry type="library" exported="" name="FreSharpANE" level="project" />
</component>
</module>
232 changes: 1 addition & 231 deletions framework_src/example/example/Main-app-64.xml
Original file line number Diff line number Diff line change
@@ -1,258 +1,28 @@
<?xml version="1.0" encoding="utf-8" ?>

<!-- Adobe AIR Application Descriptor File Template.
Specifies parameters for identifying, installing, and launching AIR applications.
xmlns - The Adobe AIR namespace: http://ns.adobe.com/air/application/25.0.
The last segment of the namespace specifies the version of the AIR runtime required for this application to run.
minimumPatchLevel - The minimum patch level of the AIR runtime required to run the application. Optional. -->

<application xmlns="http://ns.adobe.com/air/application/28.0">

<!-- A universally unique application identifier. Must be unique across all AIR applications.
Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
<id>Main</id>

<!-- Used as the filename for the application. Required. -->
<filename>Main</filename>

<!-- The name that is displayed in the AIR application installer. May have multiple values for each language. See samples or xsd schema file. Optional. -->
<name>Main</name>

<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5. -->
<versionNumber>0.0.0</versionNumber>

<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
<!--<versionLabel></versionLabel>-->

<!-- An application version designator (such as "v1", "2.5", or "Alpha 1"). Required for namespace < 2.5. -->
<!--<version>0.0.0</version>-->

<!-- Description, displayed in the AIR application installer. May have multiple values for each language. See samples or xsd schema file. Optional. -->
<!--<description></description>-->

<!-- Copyright information. Optional -->
<!--<copyright></copyright>-->

<!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
<!--<publisherID></publisherID>-->

<!-- Identifies the ActionScript extensions used by an application. -->
<extensions>
<extensionID>com.tuarua.FreSharpExampleANE</extensionID>
<extensionID>com.tuarua.FreSharp</extensionID>
</extensions>

<!-- Settings for the application's initial window. Required. -->
<initialWindow>
<!-- The main SWF or HTML file of the application. Required. -->
<content>SWF file name is set automatically at compile time</content>

<!-- The title of the main window. Optional. -->
<!--<title></title>-->

<!-- The type of system chrome to use (either "standard" or "none"). Optional. Default standard. -->
<!--<systemChrome></systemChrome>-->

<!-- Whether the window is transparent. Only applicable when systemChrome is none. Optional. Default false. -->
<!--<transparent></transparent>-->

<!-- Whether the window is initially visible. Optional. Default false. -->
<visible>true</visible>

<!-- Whether the user can minimize the window. Optional. Default true. -->
<!--<minimizable></minimizable>-->

<!-- Whether the user can maximize the window. Optional. Default true. -->
<!--<maximizable></maximizable>-->

<!-- Whether the user can resize the window. Optional. Default true. -->
<!--<resizable></resizable>-->

<!-- The window's initial width in pixels. Optional. -->
<!--<width></width>-->

<!-- The window's initial height in pixels. Optional. -->
<!--<height></height>-->

<!-- The window's initial x position. Optional. -->
<!--<x></x>-->

<!-- The window's initial y position. Optional. -->
<!--<y></y>-->

<!-- The window's minimum size, specified as a width/height pair in pixels, such as "400 200". Optional. -->
<!--<minSize></minSize>-->

<!-- The window's initial maximum size, specified as a width/height pair in pixels, such as "1600 1200". Optional. -->
<!--<maxSize></maxSize>-->

<!-- The aspect ratio of the app ("portrait" or "landscape" or "any"). Optional. Mobile only. Default is the natural orientation of the device -->
<!--<aspectRatio></aspectRatio>-->

<!-- Whether the app will begin auto-orienting on launch. Optional. Mobile only. Default false -->
<!--<autoOrients></autoOrients>-->

<!-- Whether the app launches in full screen. Optional. Mobile only. Default false -->
<!--<fullScreen></fullScreen>-->

<!-- The render mode for the app (either auto, cpu, gpu, or direct). Optional. Default auto -->
<!--<renderMode></renderMode>-->

<!-- Whether the default direct mode rendering context allocates storage for depth and stencil buffers. Optional. Default false. -->
<!--<depthAndStencil></depthAndStencil>-->

<!-- Whether or not to pan when a soft keyboard is raised or lowered (either "pan" or "none"). Optional. Defaults "pan." -->
<!--<softKeyboardBehavior></softKeyboardBehavior>-->

<!-- Display Resolution for the app (either "standard" or "high"). Optional, OSX-only. Default "standard" -->
<!-- <requestedDisplayResolution></requestedDisplayResolution> -->
</initialWindow>

<!-- We recommend omitting the supportedProfiles element, which in turn permits your application to be deployed to all devices supported by AIR.
If you wish to restrict deployment (i.e., to only mobile devices) then add this element and list only the profiles which your application does support. -->
<!--<supportedProfiles>desktop extendedDesktop mobileDevice extendedMobileDevice</supportedProfiles>-->

<!-- Languages supported by application. Only these languages can be specified -->
<!--<supportedLanguages>en de cs es fr it ja ko nl pl pt ru sv tr zh</supportedLanguages>-->

<!-- The subpath of the standard default installation location to use. Optional. -->
<!--<installFolder></installFolder>-->

<!-- The subpath of the Programs menu to use. (Ignored on operating systems without a Programs menu.) Optional. -->
<!--<programMenuFolder></programMenuFolder>-->

<!-- The icon the system uses for the application. For at least one resolution, specify the path to a PNG file included in the AIR package. Optional. -->
<!--<icon>
<image16x16></image16x16>
<image29x29></image29x29>
<image32x32></image32x32>
<image36x36></image36x36>
<image40x40></image40x40>
<image48x48></image48x48>
<image50x50></image50x50>
<image57x57></image57x57>
<image58x58></image58x58>
<image60x60></image60x60>
<image72x72></image72x72>
<image76x76></image76x76>
<image80x80></image80x80>
<image96x96></image96x96>
<image100x100></image100x100>
<image114x114></image114x114>
<image120x120></image120x120>
<image128x128></image128x128>
<image144x144></image144x144>
<image152x152></image152x152>
<image512x512></image512x512>
<image732x412></image732x412>
<image1024x1024></image1024x1024>
</icon>-->

<!-- Whether the application handles the update when a user double-clicks an update version of the AIR file (true),
or the default AIR application installer handles the update (false). Optional. Default false. -->
<!--<customUpdateUI></customUpdateUI>-->

<!-- Whether the application can be launched when the user clicks a link in a web browser. Optional. Default false. -->
<!--<allowBrowserInvocation></allowBrowserInvocation>-->

<!-- Listing of file types for which the application can register. Optional. -->
<!--<fileTypes>-->
<!-- Defines one file type. Optional. -->
<!--<fileType>-->
<!-- The name that the system displays for the registered file type. Required. -->
<!--<name></name>-->
<!-- The extension to register. Required. -->
<!--<extension></extension>-->
<!-- The description of the file type. Optional. -->
<!--<description></description>-->
<!-- The MIME content type. -->
<!--<contentType></contentType>-->
<!-- The icon to display for the file type. Optional. -->
<!--<icon>
<image16x16></image16x16>
<image32x32></image32x32>
<image48x48></image48x48>
<image128x128></image128x128>
</icon>-->
<!--</fileType>-->
<!--</fileTypes>-->

<!-- iOS specific capabilities -->
<!--<iPhone>-->
<!-- A list of plist key/value pairs to be added to the application Info.plist -->
<!--<InfoAdditions>-->
<!--<![CDATA[-->
<!--<key>UIDeviceFamily</key>-->
<!--<array>-->
<!-- iPhone and iPod touch devices -->
<!--<string>1</string>-->
<!-- iPad devices -->
<!--<string>2</string>-->
<!--</array>-->
<!--<key>UIStatusBarStyle</key>-->
<!--<string>UIStatusBarStyleBlackOpaque</string>-->
<!--<key>UIRequiresPersistentWiFi</key>-->
<!--<string>YES</string>-->
<!--]]>-->
<!--</InfoAdditions>-->

<!-- A list of plist key/value pairs to be added to the application Entitlements.plist -->
<!--<Entitlements>
<![CDATA[
<key>keychain-access-groups</key>
<array>
<string></string>
<string></string>
</array>
]]>
</Entitlements>-->

<!-- Display Resolution for the app (either "standard" or "high"). Optional. Default "standard" -->
<!--<requestedDisplayResolution>high</requestedDisplayResolution>-->
<!-- Forcing Render Mode CPU for the devices mentioned. Optional -->
<!--<forceCPURenderModeForDevices></forceCPURenderModeForDevices> -->
<!-- File containing line separated list of external swf paths. These swfs won't be packaged inside the application
and corresponding stripped swfs will be output in externalStrippedSwfs folder. -->
<!--<externalSwfs></externalSwfs> -->
<!--</iPhone>-->

<!-- Android specific tags that get passed to AndroidManifest.xml file. -->
<!--<android>-->
<!--<manifestAdditions>-->
<!--<![CDATA[-->
<!--<manifest android:installLocation="auto">-->
<!--<uses-permission android:name="android.permission.INTERNET"/>-->
<!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>-->
<!--<uses-permission android:name="android.permission.READ_PHONE_STATE"/>-->
<!--<uses-permission android:name="android.permission.VIBRATE"/>-->
<!--<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>-->
<!--<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>-->
<!--<uses-permission android:name="android.permission.WAKE_LOCK"/>-->
<!--<uses-permission android:name="android.permission.CAMERA"/>-->
<!--<uses-permission android:name="android.permission.RECORD_AUDIO"/>-->
<!--<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>-->
<!--<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>-->

<!--<uses-feature android:required="true" android:name="android.hardware.touchscreen.multitouch"/>-->
<!--<application android:enabled="true">
<activity android:excludeFromRecents="false">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>-->
<!--</manifest>-->
<!--]]>-->
<!--</manifestAdditions>-->

<!-- Color depth for the app (either "32bit" or "16bit"). Optional. Default 16bit before namespace 3.0, 32bit after -->
<!--<colorDepth></colorDepth>-->
<!-- Indicates if the app contains video or not. Necessary for ordering of video planes with graphics plane, especially in Jellybean - if you app does video this must be set to true - valid values are true or false -->
<!-- <containsVideo></containsVideo> -->
<!--</android>-->

</application>
Loading

0 comments on commit 93e413f

Please sign in to comment.