Merge branch 'develop' into DeprecatedGradleFeatures
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
<meta-data android:name="SDL_ENV.SDL_IOS_ORIENTATIONS" android:value= "LandscapeLeft LandscapeRight" />
|
||||
::end::
|
||||
|
||||
<activity android:name="MainActivity" android:launchMode="singleTask" android:label="::APP_TITLE::" android:configChanges="keyboardHidden|orientation|screenSize|screenLayout"::if (WIN_ORIENTATION=="portrait"):: android:screenOrientation="sensorPortrait"::end::::if (WIN_ORIENTATION=="landscape"):: android:screenOrientation="sensorLandscape"::end:: android:exported="true">
|
||||
<activity android:name="MainActivity" android:exported="true" android:launchMode="singleTask" android:label="::APP_TITLE::" android:configChanges="keyboardHidden|orientation|screenSize|screenLayout|uiMode"::if (WIN_ORIENTATION=="portrait"):: android:screenOrientation="sensorPortrait"::end::::if (WIN_ORIENTATION=="landscape"):: android:screenOrientation="sensorLandscape"::end::>
|
||||
|
||||
<intent-filter>
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#if !disable_preloader_assets
|
||||
package;
|
||||
|
||||
|
||||
import haxe.io.Bytes;
|
||||
import lime.utils.AssetBundle;
|
||||
import lime.utils.AssetLibrary;
|
||||
@@ -12,6 +10,18 @@ import lime.utils.Assets;
|
||||
import sys.FileSystem;
|
||||
#end
|
||||
|
||||
#if disable_preloader_assets
|
||||
@:dox(hide) class ManifestResources {
|
||||
public static var preloadLibraries:Array<Dynamic>;
|
||||
public static var preloadLibraryNames:Array<String>;
|
||||
public static var rootPath:String;
|
||||
|
||||
public static function init (config:Dynamic):Void {
|
||||
preloadLibraries = new Array ();
|
||||
preloadLibraryNames = new Array ();
|
||||
}
|
||||
}
|
||||
#else
|
||||
@:access(lime.utils.Assets)
|
||||
|
||||
|
||||
|
||||
4
templates/hl/mac-launch.sh
Normal file
4
templates/hl/mac-launch.sh
Normal file
@@ -0,0 +1,4 @@
|
||||
#!/usr/bin/env sh
|
||||
# HashLink needs a specific working directory to find hlboot.dat and libraries
|
||||
cd "$(dirname "$0")"
|
||||
exec ./hl
|
||||
Reference in New Issue
Block a user