diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 117241ede..0afe8c6d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,9 +5,6 @@ jobs: linux-ndll: runs-on: ubuntu-20.04 - strategy: - matrix: - haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5] steps: - uses: actions/checkout@v3 @@ -21,7 +18,7 @@ jobs: - uses: krdlab/setup-haxe@v1 with: - haxe-version: ${{ matrix.haxe-version }} + haxe-version: 4.2.5 - name: Set HAXEPATH run: | @@ -50,7 +47,6 @@ jobs: lime rebuild hl -clean -release -nocolor -verbose -nocffi - uses: actions/upload-artifact@v3 - if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe with: name: Linux-NDLL path: | @@ -59,7 +55,6 @@ jobs: if-no-files-found: error - uses: actions/upload-artifact@v3 - if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe with: name: Linux64-NDLL path: | @@ -68,7 +63,6 @@ jobs: if-no-files-found: error - uses: actions/upload-artifact@v3 - if: ${{ matrix.haxe-version == '4.2.5' }} # upload for only one version of Haxe with: name: Linux64-Hashlink path: | @@ -558,50 +552,21 @@ jobs: hashlink-samples: needs: package-haxelib - strategy: - matrix: - os: [ubuntu-20.04 - , macos-11, windows-latest] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-20.04 steps: - uses: krdlab/setup-haxe@v1 with: haxe-version: 4.2.5 - - name: Set HAXEPATH (Windows) - if: ${{ startsWith(matrix.os, 'windows-') }} - run: | - echo "HAXEPATH=$Env:HAXE_STD_PATH\.." >> $Env:GITHUB_ENV - - - name: Set HAXEPATH (macOS/Linux) - if: ${{ !startsWith(matrix.os, 'windows-') }} + - name: Set HAXEPATH run: | echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV - - name: Install system dependencies (Linux) - if: ${{ startsWith(matrix.os, 'ubuntu-') }} - run: | - sudo apt-get update - sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev - - name: Install Haxe dependencies run: | - haxelib install hxcpp 4.2.1 --quiet - haxelib install format --quiet - haxelib install hxp --quiet haxelib git lime-samples https://github.com/openfl/lime-samples --quiet - - name: Enable HXCPP compile cache (Windows) - if: ${{ startsWith(matrix.os, 'windows-') }} - run: | - echo "HXCPP_COMPILE_CACHE=C:\.hxcpp" >> $Env:GITHUB_ENV - - - name: Enable HXCPP compile cache (macOS/Linux) - if: ${{ !startsWith(matrix.os, 'windows-') }} - run: | - echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV - - uses: actions/download-artifact@v3 with: name: lime-haxelib @@ -821,49 +786,24 @@ jobs: neko-samples: needs: package-haxelib + runs-on: ubuntu-20.04 strategy: matrix: - os: [ubuntu-20.04, macos-11, windows-latest] - runs-on: ${{ matrix.os }} + haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.1] steps: - uses: krdlab/setup-haxe@v1 with: - haxe-version: 4.2.5 + haxe-version: ${{ matrix.haxe-version }} - - name: Set HAXEPATH (Windows) - if: ${{ startsWith(matrix.os, 'windows-') }} - run: | - echo "HAXEPATH=$Env:HAXE_STD_PATH\.." >> $Env:GITHUB_ENV - - - name: Set HAXEPATH (macOS/Linux) - if: ${{ !startsWith(matrix.os, 'windows-') }} + - name: Set HAXEPATH run: | echo "HAXEPATH=$HAXE_STD_PATH/.." >> $GITHUB_ENV - - name: Install system dependencies (Linux) - if: ${{ startsWith(matrix.os, 'ubuntu-') }} - run: | - sudo apt-get update - sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev g++-multilib gcc-multilib libasound2-dev libx11-dev libxext-dev libxi-dev libxrandr-dev libxinerama-dev - - name: Install Haxe dependencies run: | - haxelib install hxcpp 4.2.1 --quiet - haxelib install format --quiet - haxelib install hxp --quiet haxelib git lime-samples https://github.com/openfl/lime-samples --quiet - - name: Enable HXCPP compile cache (Windows) - if: ${{ startsWith(matrix.os, 'windows-') }} - run: | - echo "HXCPP_COMPILE_CACHE=C:\.hxcpp" >> $Env:GITHUB_ENV - - - name: Enable HXCPP compile cache (macOS/Linux) - if: ${{ !startsWith(matrix.os, 'windows-') }} - run: | - echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV - - uses: actions/download-artifact@v3 with: name: lime-haxelib diff --git a/.gitmodules b/.gitmodules index c2d654adf..6c138f205 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ url = https://github.com/openfl/libopenal [submodule "project/lib/curl"] path = project/lib/curl - url = https://github.com/openfl/libcurl + url = https://github.com/curl/curl [submodule "project/lib/ogg"] path = project/lib/ogg url = https://github.com/openfl/libogg @@ -54,7 +54,7 @@ url = https://github.com/openfl/libwebm [submodule "project/lib/mbedtls"] path = project/lib/mbedtls - url = https://github.com/openfl/libmbedtls + url = https://github.com/Mbed-TLS/mbedtls [submodule "project/lib/mojoal"] path = project/lib/mojoal url = https://github.com/openfl/libmojoal diff --git a/CHANGELOG.md b/CHANGELOG.md index ce7783641..e62abb25d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,28 @@ Changelog ========= +8.0.2 (05/31/2023) +------------------ + +* Resolve new `@:enum abstract` warnings for Haxe 4.3 by replacing with `enum abstract`, if current Haxe version supports it +* Resolve new `@:extern` warnings for Haxe 4.3 by replacing with `extern`, if current Haxe version supports it +* Fixed HTTPS requests failing on macOS by updating cURL and mbedtls dependencies +* Fixed calling `JNI.callMember()` and `JNI.callStatic()` with more than 7 arguments +* Fixed DPI detection on Android by using `getDisplayMetrics()` +* Fixed passing `null` or empty string for default library to `Assets.registerLibrary()` to be more consistent with other APIs +* Fixed failed Lime tools build with some Haxe versions by removing `-D no-inline` +* Fixed Haxe argument type of OpenAL `alFilteri` wrapper that should be `Int` instead of `Dynamic` +* Fixed bad UTF string conversion for `FileDialog` that sometimes displayed incorrect characters on some platforms +* Fixed HTTP request status 400 being incorrectly treated as successful on html5 target +* Fixed failed Adobe AIR for iOS build on Windows by removing check for simulators, which are available on macOS only +* Fixed detection of default iPhone simulator to avoid exceptions and support future versions of Xcode +* Fixed conflict between `window.Image` and `lime.graphics.Image` when using Genes on html5 target +* Fixed exception in Lime tools if assets directory does not exist +* Removed legacy `armv7` from default iOS target architectures because it now results in an error (now defaults to `arm64`) +* AIR for iOS or Android may specify `listen="port"` in `` element to use USB debugging instead of wifi debugging +* Improved fix for text fields updating properly on Android devices with html5 target +* Replaced "Could not find Neko API interface" error message with more detailed explanation and instructions + 8.0.1 (02/21/2023) ------------------ diff --git a/externs/air/flash/data/SQLCollationType.hx b/externs/air/flash/data/SQLCollationType.hx index 42017df56..fbe18701d 100644 --- a/externs/air/flash/data/SQLCollationType.hx +++ b/externs/air/flash/data/SQLCollationType.hx @@ -1,7 +1,7 @@ package flash.data; @:native("flash.data.SQLCollationType") -@:enum extern abstract SQLCollationType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLCollationType(String) { var BINARY; var NO_CASE; diff --git a/externs/air/flash/data/SQLColumnNameStyle.hx b/externs/air/flash/data/SQLColumnNameStyle.hx index e6e83eeeb..c27bc6661 100644 --- a/externs/air/flash/data/SQLColumnNameStyle.hx +++ b/externs/air/flash/data/SQLColumnNameStyle.hx @@ -1,7 +1,7 @@ package flash.data; @:native("flash.data.SQLColumnNameStyle") -@:enum extern abstract SQLColumnNameStyle(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLColumnNameStyle(String) { var DEFAULT; var LONG; diff --git a/externs/air/flash/data/SQLMode.hx b/externs/air/flash/data/SQLMode.hx index 55a9f7dfb..284a3d04d 100644 --- a/externs/air/flash/data/SQLMode.hx +++ b/externs/air/flash/data/SQLMode.hx @@ -1,7 +1,7 @@ package flash.data; @:native("flash.data.SQLMode") -@:enum extern abstract SQLMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLMode(String) { var CREATE; var READ; diff --git a/externs/air/flash/data/SQLTransactionLockType.hx b/externs/air/flash/data/SQLTransactionLockType.hx index 7637611ad..16912db4c 100644 --- a/externs/air/flash/data/SQLTransactionLockType.hx +++ b/externs/air/flash/data/SQLTransactionLockType.hx @@ -1,7 +1,7 @@ package flash.data; @:native("flash.data.SQLTransactionLockType") -@:enum extern abstract SQLTransactionLockType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLTransactionLockType(String) { var DEFERRED; var EXCLUSIVE; diff --git a/externs/air/flash/desktop/InvokeEventReason.hx b/externs/air/flash/desktop/InvokeEventReason.hx index ba94a5729..216be7d91 100644 --- a/externs/air/flash/desktop/InvokeEventReason.hx +++ b/externs/air/flash/desktop/InvokeEventReason.hx @@ -1,7 +1,7 @@ package flash.desktop; @:native("flash.desktop.InvokeEventReason") -@:enum extern abstract InvokeEventReason(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract InvokeEventReason(String) { var LOGIN; var NOTIFICATION; diff --git a/externs/air/flash/desktop/NativeDragActions.hx b/externs/air/flash/desktop/NativeDragActions.hx index b6e43f1aa..d40e9168c 100644 --- a/externs/air/flash/desktop/NativeDragActions.hx +++ b/externs/air/flash/desktop/NativeDragActions.hx @@ -1,7 +1,7 @@ package flash.desktop; @:native("flash.desktop.NativeDragActions") -@:enum extern abstract NativeDragActions(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeDragActions(String) { var COPY; var LINK; diff --git a/externs/air/flash/desktop/NotificationType.hx b/externs/air/flash/desktop/NotificationType.hx index 7769d22ab..8066974bb 100644 --- a/externs/air/flash/desktop/NotificationType.hx +++ b/externs/air/flash/desktop/NotificationType.hx @@ -1,7 +1,7 @@ package flash.desktop; @:native("flash.desktop.NotificationType") -@:enum extern abstract NotificationType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NotificationType(String) { var CRITICAL; var INFORMATIONAL; diff --git a/externs/air/flash/desktop/SystemIdleMode.hx b/externs/air/flash/desktop/SystemIdleMode.hx index 3e230584d..96d9d2b99 100644 --- a/externs/air/flash/desktop/SystemIdleMode.hx +++ b/externs/air/flash/desktop/SystemIdleMode.hx @@ -1,7 +1,7 @@ package flash.desktop; @:native("flash.desktop.SystemIdleMode") -@:enum extern abstract SystemIdleMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SystemIdleMode(String) { var KEEP_AWAKE; var NORMAL; diff --git a/externs/air/flash/display/DisplayObject.hx b/externs/air/flash/display/DisplayObject.hx index 10727c2b7..033dc45fd 100644 --- a/externs/air/flash/display/DisplayObject.hx +++ b/externs/air/flash/display/DisplayObject.hx @@ -2,6 +2,7 @@ package flash.display; extern class DisplayObject extends flash.events.EventDispatcher implements IBitmapDrawable { + #if (haxe_ver < 4.3) var accessibilityProperties:flash.accessibility.AccessibilityProperties; var alpha:Float; var blendMode:BlendMode; @@ -36,6 +37,42 @@ extern class DisplayObject extends flash.events.EventDispatcher implements IBitm var x:Float; var y:Float; @:require(flash10) var z:Float; + #else + @:flash.property var accessibilityProperties:flash.accessibility.AccessibilityProperties; + @:flash.property var alpha:Float; + @:flash.property var blendMode:BlendMode; + @:flash.property @:require(flash10) var blendShader(never, default):Shader; + @:flash.property var cacheAsBitmap:Bool; + #if air + @:flash.property var cacheAsBitmapMatrix:flash.geom.Matrix; + #end + @:flash.property var filters(get, set):Array; + @:flash.property var height(get, set):Float; + @:flash.property var loaderInfo(get, never):LoaderInfo; + @:flash.property var mask(get, set):DisplayObject; + @:flash.property var mouseX(get, never):Float; + @:flash.property var mouseY(get, never):Float; + @:flash.property var name(get, set):String; + @:flash.property var opaqueBackground(get, set):Null; + @:flash.property var parent(get, never):DisplayObjectContainer; + @:flash.property var root(get, never):DisplayObject; + @:flash.property var rotation(get, set):Float; + @:flash.property @:require(flash10) var rotationX(get, set):Float; + @:flash.property @:require(flash10) var rotationY(get, set):Float; + @:flash.property @:require(flash10) var rotationZ(get, set):Float; + @:flash.property var scale9Grid(get, set):flash.geom.Rectangle; + @:flash.property var scaleX(get, set):Float; + @:flash.property var scaleY(get, set):Float; + @:flash.property @:require(flash10) var scaleZ(get, set):Float; + @:flash.property var scrollRect(get, set):flash.geom.Rectangle; + @:flash.property var stage(get, never):Stage; + @:flash.property var transform(get, set):flash.geom.Transform; + @:flash.property var visible(get, set):Bool; + @:flash.property var width(get, set):Float; + @:flash.property var x(get, set):Float; + @:flash.property var y(get, set):Float; + @:flash.property @:require(flash10) var z(get, set):Float; + #end function getBounds(targetCoordinateSpace:DisplayObject):flash.geom.Rectangle; function getRect(targetCoordinateSpace:DisplayObject):flash.geom.Rectangle; function globalToLocal(point:flash.geom.Point):flash.geom.Point; @@ -44,4 +81,70 @@ extern class DisplayObject extends flash.events.EventDispatcher implements IBitm function hitTestPoint(x:Float, y:Float, shapeFlag:Bool = false):Bool; @:require(flash10) function local3DToGlobal(point3d:flash.geom.Vector3D):flash.geom.Point; function localToGlobal(point:flash.geom.Point):flash.geom.Point; + + #if (haxe_ver >= 4.3) + private function get_accessibilityProperties():flash.accessibility.AccessibilityProperties; + private function get_alpha():Float; + private function get_blendMode():BlendMode; + private function get_cacheAsBitmap():Bool; + private function get_filters():Array; + private function get_height():Float; + private function get_loaderInfo():LoaderInfo; + private function get_mask():DisplayObject; + private function get_metaData():Dynamic; + private function get_mouseX():Float; + private function get_mouseY():Float; + private function get_name():String; + private function get_opaqueBackground():Null; + private function get_parent():DisplayObjectContainer; + private function get_root():DisplayObject; + private function get_rotation():Float; + private function get_rotationX():Float; + private function get_rotationY():Float; + private function get_rotationZ():Float; + private function get_scale9Grid():flash.geom.Rectangle; + private function get_scaleX():Float; + private function get_scaleY():Float; + private function get_scaleZ():Float; + private function get_scrollRect():flash.geom.Rectangle; + private function get_stage():Stage; + private function get_transform():flash.geom.Transform; + private function get_visible():Bool; + private function get_width():Float; + private function get_x():Float; + private function get_y():Float; + private function get_z():Float; + #if air + private function get_cacheAsBitmapMatrix():flash.geom.Matrix; + #end + private function set_accessibilityProperties(value:flash.accessibility.AccessibilityProperties):flash.accessibility.AccessibilityProperties; + private function set_alpha(value:Float):Float; + private function set_blendMode(value:BlendMode):BlendMode; + private function set_blendShader(value:Shader):Shader; + private function set_cacheAsBitmap(value:Bool):Bool; + private function set_filters(value:Array):Array; + private function set_height(value:Float):Float; + private function set_mask(value:DisplayObject):DisplayObject; + private function set_metaData(value:Dynamic):Dynamic; + private function set_name(value:String):String; + private function set_opaqueBackground(value:Null):Null; + private function set_rotation(value:Float):Float; + private function set_rotationX(value:Float):Float; + private function set_rotationY(value:Float):Float; + private function set_rotationZ(value:Float):Float; + private function set_scale9Grid(value:flash.geom.Rectangle):flash.geom.Rectangle; + private function set_scaleX(value:Float):Float; + private function set_scaleY(value:Float):Float; + private function set_scaleZ(value:Float):Float; + private function set_scrollRect(value:flash.geom.Rectangle):flash.geom.Rectangle; + private function set_transform(value:flash.geom.Transform):flash.geom.Transform; + private function set_visible(value:Bool):Bool; + private function set_width(value:Float):Float; + private function set_x(value:Float):Float; + private function set_y(value:Float):Float; + private function set_z(value:Float):Float; + #if air + private function set_cacheAsBitmapMatrix(value:flash.geom.Matrix):flash.geom.Matrix; + #end + #end } diff --git a/externs/air/flash/display/InteractiveObject.hx b/externs/air/flash/display/InteractiveObject.hx index 7ae2c88ed..14ff81c08 100644 --- a/externs/air/flash/display/InteractiveObject.hx +++ b/externs/air/flash/display/InteractiveObject.hx @@ -2,6 +2,7 @@ package flash.display; extern class InteractiveObject extends DisplayObject { + #if (haxe_ver < 4.3) var accessibilityImplementation:flash.accessibility.AccessibilityImplementation; // var contextMenu : #if air flash.display.NativeMenu #else flash.ui.ContextMenu #end; var contextMenu:NativeMenu; @@ -12,6 +13,39 @@ extern class InteractiveObject extends DisplayObject @:require(flash11) var softKeyboardInputAreaOfInterest:flash.geom.Rectangle; var tabEnabled:Bool; var tabIndex:Int; + #else + @:flash.property var accessibilityImplementation(get, set):flash.accessibility.AccessibilityImplementation; + // @:flash.property var contextMenu : #if air flash.display.NativeMenu #else flash.ui.ContextMenu #end; + @:flash.property var contextMenu(get, set):NativeMenu; + @:flash.property var doubleClickEnabled(get, set):Bool; + @:flash.property var focusRect(get, set):Dynamic; + @:flash.property var mouseEnabled(get, set):Bool; + @:flash.property @:require(flash11) var needsSoftKeyboard(get, set):Bool; + @:flash.property @:require(flash11) var softKeyboardInputAreaOfInterest(get, set):flash.geom.Rectangle; + @:flash.property var tabEnabled(get, set):Bool; + @:flash.property var tabIndex(get, set):Int; + #end function new():Void; @:require(flash11) function requestSoftKeyboard():Bool; + + #if (haxe_ver >= 4.3) + private function get_accessibilityImplementation():flash.accessibility.AccessibilityImplementation; + private function get_contextMenu():#if air flash.display.NativeMenu #else flash.ui.ContextMenu #end; + private function get_doubleClickEnabled():Bool; + private function get_focusRect():Dynamic; + private function get_mouseEnabled():Bool; + private function get_needsSoftKeyboard():Bool; + private function get_softKeyboardInputAreaOfInterest():flash.geom.Rectangle; + private function get_tabEnabled():Bool; + private function get_tabIndex():Int; + private function set_accessibilityImplementation(value:flash.accessibility.AccessibilityImplementation):flash.accessibility.AccessibilityImplementation; + private function set_contextMenu(value:#if air flash.display.NativeMenu #else flash.ui.ContextMenu #end):#if air flash.display.NativeMenu #else flash.ui.ContextMenu #end; + private function set_doubleClickEnabled(value:Bool):Bool; + private function set_focusRect(value:Dynamic):Dynamic; + private function set_mouseEnabled(value:Bool):Bool; + private function set_needsSoftKeyboard(value:Bool):Bool; + private function set_softKeyboardInputAreaOfInterest(value:flash.geom.Rectangle):flash.geom.Rectangle; + private function set_tabEnabled(value:Bool):Bool; + private function set_tabIndex(value:Int):Int; + #end } diff --git a/externs/air/flash/display/Loader.hx b/externs/air/flash/display/Loader.hx index 867b788ae..cb41a5699 100644 --- a/externs/air/flash/display/Loader.hx +++ b/externs/air/flash/display/Loader.hx @@ -2,9 +2,15 @@ package flash.display; extern class Loader extends DisplayObjectContainer { + #if (haxe_ver < 4.3) var content(default, never):DisplayObject; var contentLoaderInfo(default, never):LoaderInfo; @:require(flash10_1) var uncaughtErrorEvents(default, never):flash.events.UncaughtErrorEvents; + #else + @:flash.property var content(get, never):DisplayObject; + @:flash.property var contentLoaderInfo(get, never):LoaderInfo; + @:flash.property @:require(flash10_1) var uncaughtErrorEvents(get, never):flash.events.UncaughtErrorEvents; + #end function new():Void; function close():Void; function load(request:flash.net.URLRequest, ?context:flash.system.LoaderContext):Void; @@ -14,4 +20,10 @@ extern class Loader extends DisplayObjectContainer #end function unload():Void; @:require(flash10) function unloadAndStop(gc:Bool = true):Void; + + #if (haxe_ver >= 4.3) + private function get_content():DisplayObject; + private function get_contentLoaderInfo():LoaderInfo; + private function get_uncaughtErrorEvents():flash.events.UncaughtErrorEvents; + #end } diff --git a/externs/air/flash/display/NativeMenu.hx b/externs/air/flash/display/NativeMenu.hx index 066f5e2e9..09c711cb6 100644 --- a/externs/air/flash/display/NativeMenu.hx +++ b/externs/air/flash/display/NativeMenu.hx @@ -2,10 +2,20 @@ package flash.display; @:require(flash10_1) extern class NativeMenu extends flash.events.EventDispatcher { + #if (haxe_ver < 4.3) #if air var items:Array; var numItems(default, never):Int; var parent(default, never):NativeMenu; + static var isSupported(default, never):Bool; + #end + #else + #if air + @:flash.property var items(get, set):Array; + @:flash.property var numItems(get, never):Int; + @:flash.property var parent(get, never):NativeMenu; + @:flash.property static var isSupported(get, never):Bool; + #end #end function new():Void; #if air @@ -24,6 +34,15 @@ package flash.display; function removeItem(item:NativeMenuItem):NativeMenuItem; function removeItemAt(index:Int):NativeMenuItem; function setItemIndex(item:NativeMenuItem, index:Int):Void; - static var isSupported(default, never):Bool; + #end + + #if (haxe_ver >= 4.3) + #if air + private function get_items():Array; + private function get_numItems():Int; + private function get_parent():NativeMenu; + private function set_items(value:Array):Array; + private static function get_isSupported():Bool; + #end #end } diff --git a/externs/air/flash/display/NativeMenuItem.hx b/externs/air/flash/display/NativeMenuItem.hx index a0cd6eeed..ad5e91135 100644 --- a/externs/air/flash/display/NativeMenuItem.hx +++ b/externs/air/flash/display/NativeMenuItem.hx @@ -2,6 +2,7 @@ package flash.display; @:require(flash10_1) extern class NativeMenuItem extends flash.events.EventDispatcher { + #if (haxe_ver < 4.3) var checked:Bool; var data:Dynamic; var enabled:Bool; @@ -13,7 +14,44 @@ package flash.display; var mnemonicIndex:Int; var name:String; var submenu:NativeMenu; + #else + @:flash.property var checked(get, set):Bool; + @:flash.property var data(get, set):Dynamic; + @:flash.property var enabled(get, set):Bool; + @:flash.property var isSeparator(get, never):Bool; + @:flash.property var keyEquivalent(get, set):String; + @:flash.property var keyEquivalentModifiers(get, set):Array; + @:flash.property var label(get, set):String; + @:flash.property var menu(get, never):NativeMenu; + @:flash.property var mnemonicIndex(get, set):Int; + @:flash.property var name(get, set):String; + @:flash.property var submenu(get, set):NativeMenu; + #end + function new(?label:String = "", ?isSeparator:Bool = false):Void; function clone():NativeMenuItem; override function toString():String; + + #if (haxe_ver >= 4.3) + private function get_checked():Bool; + private function get_data():Dynamic; + private function get_enabled():Bool; + private function get_isSeparator():Bool; + private function get_keyEquivalent():String; + private function get_keyEquivalentModifiers():Array; + private function get_label():String; + private function get_menu():NativeMenu; + private function get_mnemonicIndex():Int; + private function get_name():String; + private function get_submenu():NativeMenu; + private function set_checked(value:Bool):Bool; + private function set_data(value:Dynamic):Dynamic; + private function set_enabled(value:Bool):Bool; + private function set_keyEquivalent(value:String):String; + private function set_keyEquivalentModifiers(value:Array):Array; + private function set_label(value:String):String; + private function set_mnemonicIndex(value:Int):Int; + private function set_name(value:String):String; + private function set_submenu(value:NativeMenu):NativeMenu; + #end } diff --git a/externs/air/flash/display/NativeWindow.hx b/externs/air/flash/display/NativeWindow.hx index 2c8b8590d..9517b4f74 100644 --- a/externs/air/flash/display/NativeWindow.hx +++ b/externs/air/flash/display/NativeWindow.hx @@ -2,6 +2,7 @@ package flash.display; extern class NativeWindow extends flash.events.EventDispatcher { + #if (haxe_ver < 4.3) var active(default, never):Bool; var alwaysInFront:Bool; var bounds:flash.geom.Rectangle; @@ -25,6 +26,44 @@ extern class NativeWindow extends flash.events.EventDispatcher var width:Float; var x:Float; var y:Float; + static var isSupported(default, never):Bool; + static var supportsMenu(default, never):Bool; + static var supportsNotification(default, never):Bool; + static var supportsTransparency(default, never):Bool; + static var systemMaxSize(default, never):flash.geom.Point; + static var systemMinSize(default, never):flash.geom.Point; + #else + @:flash.property var active(get, never):Bool; + @:flash.property var alwaysInFront(get, set):Bool; + @:flash.property var bounds(get, set):flash.geom.Rectangle; + @:flash.property var closed(get, never):Bool; + @:flash.property var displayState(get, never):NativeWindowDisplayState; + @:flash.property var height(get, set):Float; + @:flash.property var maxSize(get, set):flash.geom.Point; + @:flash.property var maximizable(get, never):Bool; + @:flash.property var menu(get, set):NativeMenu; + @:flash.property var minSize(get, set):flash.geom.Point; + @:flash.property var minimizable(get, never):Bool; + @:flash.property var owner(get, never):NativeWindow; + @:flash.property var renderMode(get, never):NativeWindowRenderMode; + @:flash.property var resizable(get, never):Bool; + @:flash.property var stage(get, never):Stage; + @:flash.property var systemChrome(get, never):NativeWindowSystemChrome; + @:flash.property var title(get, set):String; + @:flash.property var transparent(get, never):Bool; + @:flash.property var type(get, never):NativeWindowType; + @:flash.property var visible(get, set):Bool; + @:flash.property var width(get, set):Float; + @:flash.property var x(get, set):Float; + @:flash.property var y(get, set):Float; + @:flash.property static var isSupported(get, never):Bool; + @:flash.property static var supportsMenu(get, never):Bool; + @:flash.property static var supportsNotification(get, never):Bool; + @:flash.property static var supportsTransparency(get, never):Bool; + @:flash.property static var systemMaxSize(get, never):flash.geom.Point; + @:flash.property static var systemMinSize(get, never):flash.geom.Point; + #end + function new(initOptions:NativeWindowInitOptions):Void; function activate():Void; function close():Void; @@ -40,10 +79,49 @@ extern class NativeWindow extends flash.events.EventDispatcher function restore():Void; function startMove():Bool; function startResize(?edgeOrCorner:NativeWindowResize = NativeWindowResize.BOTTOM_RIGHT):Bool; - static var isSupported(default, never):Bool; - static var supportsMenu(default, never):Bool; - static var supportsNotification(default, never):Bool; - static var supportsTransparency(default, never):Bool; - static var systemMaxSize(default, never):flash.geom.Point; - static var systemMinSize(default, never):flash.geom.Point; + + #if (haxe_ver >= 4.3) + private function get_active():Bool; + private function get_alwaysInFront():Bool; + private function get_bounds():flash.geom.Rectangle; + private function get_closed():Bool; + private function get_displayState():NativeWindowDisplayState; + private function get_height():Float; + private function get_maxSize():flash.geom.Point; + private function get_maximizable():Bool; + private function get_menu():NativeMenu; + private function get_minSize():flash.geom.Point; + private function get_minimizable():Bool; + private function get_owner():NativeWindow; + private function get_renderMode():NativeWindowRenderMode; + private function get_resizable():Bool; + private function get_stage():Stage; + private function get_systemChrome():NativeWindowSystemChrome; + private function get_title():String; + private function get_transparent():Bool; + private function get_type():NativeWindowType; + private function get_visible():Bool; + private function get_width():Float; + private function get_x():Float; + private function get_y():Float; + private function set_alwaysInFront(value:Bool):Bool; + private function set_bounds(value:flash.geom.Rectangle):flash.geom.Rectangle; + private function set_height(value:Float):Float; + private function set_maxSize(value:flash.geom.Point):flash.geom.Point; + private function set_maximizable(value:Bool):Bool; + private function set_menu(value:NativeMenu):NativeMenu; + private function set_minSize(value:flash.geom.Point):flash.geom.Point; + private function set_minimizable(value:Bool):Bool; + private function set_title(value:String):String; + private function set_visible(value:Bool):Bool; + private function set_width(value:Float):Float; + private function set_x(value:Float):Float; + private function set_y(value:Float):Float; + private static function get_isSupported():Bool; + private static function get_supportsMenu():Bool; + private static function get_supportsNotification():Bool; + private static function get_supportsTransparency():Bool; + private static function get_systemMaxSize():flash.geom.Point; + private static function get_systemMinSize():flash.geom.Point; + #end } diff --git a/externs/air/flash/display/NativeWindowDisplayState.hx b/externs/air/flash/display/NativeWindowDisplayState.hx index 0fc2b7996..f90cfc645 100644 --- a/externs/air/flash/display/NativeWindowDisplayState.hx +++ b/externs/air/flash/display/NativeWindowDisplayState.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.NativeWindowDisplayState") -@:enum extern abstract NativeWindowDisplayState(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowDisplayState(String) { var MAXIMIZED; var MINIMIZED; diff --git a/externs/air/flash/display/NativeWindowInitOptions.hx b/externs/air/flash/display/NativeWindowInitOptions.hx index a01ebc0c4..4d9cf1bf9 100644 --- a/externs/air/flash/display/NativeWindowInitOptions.hx +++ b/externs/air/flash/display/NativeWindowInitOptions.hx @@ -2,6 +2,7 @@ package flash.display; extern class NativeWindowInitOptions { + #if (haxe_ver < 4.3) var maximizable:Bool; var minimizable:Bool; var owner:NativeWindow; @@ -10,5 +11,35 @@ extern class NativeWindowInitOptions var systemChrome:NativeWindowSystemChrome; var transparent:Bool; var type:NativeWindowType; + #else + @:flash.property var maximizable(get, set):Bool; + @:flash.property var minimizable(get, set):Bool; + @:flash.property var owner(get, set):NativeWindow; + @:flash.property var renderMode(get, set):NativeWindowRenderMode; + @:flash.property var resizable(get, set):Bool; + @:flash.property var systemChrome(get, set):NativeWindowSystemChrome; + @:flash.property var transparent(get, set):Bool; + @:flash.property var type(get, set):NativeWindowType; + #end + function new():Void; + + #if (haxe_ver >= 4.3) + private function get_maximizable():Bool; + private function get_minimizable():Bool; + private function get_owner():NativeWindow; + private function get_renderMode():NativeWindowRenderMode; + private function get_resizable():Bool; + private function get_systemChrome():NativeWindowSystemChrome; + private function get_transparent():Bool; + private function get_type():NativeWindowType; + private function set_maximizable(value:Bool):Bool; + private function set_minimizable(value:Bool):Bool; + private function set_owner(value:NativeWindow):NativeWindow; + private function set_renderMode(value:NativeWindowRenderMode):NativeWindowRenderMode; + private function set_resizable(value:Bool):Bool; + private function set_systemChrome(value:NativeWindowSystemChrome):NativeWindowSystemChrome; + private function set_transparent(value:Bool):Bool; + private function set_type(value:NativeWindowType):NativeWindowType; + #end } diff --git a/externs/air/flash/display/NativeWindowRenderMode.hx b/externs/air/flash/display/NativeWindowRenderMode.hx index 9d453d776..7f4d8a48a 100644 --- a/externs/air/flash/display/NativeWindowRenderMode.hx +++ b/externs/air/flash/display/NativeWindowRenderMode.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.NativeWindowRenderMode") -@:enum extern abstract NativeWindowRenderMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowRenderMode(String) { var AUTO; var CPU; diff --git a/externs/air/flash/display/NativeWindowResize.hx b/externs/air/flash/display/NativeWindowResize.hx index b60350516..3adf87ef6 100644 --- a/externs/air/flash/display/NativeWindowResize.hx +++ b/externs/air/flash/display/NativeWindowResize.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.NativeWindowResize") -@:enum extern abstract NativeWindowResize(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowResize(String) { var BOTTOM; var BOTTOM_LEFT; diff --git a/externs/air/flash/display/NativeWindowSystemChrome.hx b/externs/air/flash/display/NativeWindowSystemChrome.hx index b005630d7..33a39cc12 100644 --- a/externs/air/flash/display/NativeWindowSystemChrome.hx +++ b/externs/air/flash/display/NativeWindowSystemChrome.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.NativeWindowSystemChrome") -@:enum extern abstract NativeWindowSystemChrome(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowSystemChrome(String) { var ALTERNATE; var NONE; diff --git a/externs/air/flash/display/NativeWindowType.hx b/externs/air/flash/display/NativeWindowType.hx index b8eab2e03..5a278235b 100644 --- a/externs/air/flash/display/NativeWindowType.hx +++ b/externs/air/flash/display/NativeWindowType.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.NativeWindowType") -@:enum extern abstract NativeWindowType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowType(String) { var LIGHTWEIGHT; var NORMAL; diff --git a/externs/air/flash/display/Screen.hx b/externs/air/flash/display/Screen.hx index 372d36006..2201ea53f 100644 --- a/externs/air/flash/display/Screen.hx +++ b/externs/air/flash/display/Screen.hx @@ -2,11 +2,27 @@ package flash.display; extern class Screen extends flash.events.EventDispatcher { + #if (haxe_ver < 4.3) var bounds(default, never):flash.geom.Rectangle; var colorDepth(default, never):Int; var visibleBounds(default, never):flash.geom.Rectangle; - function new():Void; static var mainScreen(default, never):Screen; static var screens(default, never):Array; + #else + @:flash.property var bounds(get, never):flash.geom.Rectangle; + @:flash.property var colorDepth(get, never):Int; + @:flash.property var visibleBounds(get, never):flash.geom.Rectangle; + @:flash.property static var mainScreen(get, never):Screen; + @:flash.property static var screens(get, never):Array; + #end + function new():Void; static function getScreensForRectangle(rect:flash.geom.Rectangle):Array; + + #if (haxe_ver >= 4.3) + private function get_bounds():flash.geom.Rectangle; + private function get_colorDepth():Int; + private function get_visibleBounds():flash.geom.Rectangle; + private static function get_mainScreen():Screen; + private static function get_screens():Array; + #end } diff --git a/externs/air/flash/display/Stage.hx b/externs/air/flash/display/Stage.hx index 48013052e..6c51d8e5c 100644 --- a/externs/air/flash/display/Stage.hx +++ b/externs/air/flash/display/Stage.hx @@ -2,6 +2,7 @@ package flash.display; extern class Stage extends DisplayObjectContainer { + #if (haxe_ver < 4.3) var align:StageAlign; var allowsFullScreen(default, never):Bool; @:require(flash11_3) var allowsFullScreenInteractive(default, never):Bool; @@ -42,6 +43,49 @@ extern class Stage extends DisplayObjectContainer var supportedOrientations(default, never):flash.Vector; #end @:require(flash10_1) var wmodeGPU(default, never):Bool; + static var supportsOrientationChange(default, never):Bool; + #else + @:flash.property var align(get, set):StageAlign; + @:flash.property var allowsFullScreen(get, never):Bool; + @:flash.property @:require(flash11_3) var allowsFullScreenInteractive(get, never):Bool; + #if air + @:flash.property var autoOrients(get, set):Bool; + #end + @:flash.property var browserZoomFactor(get, never):Float; + @:flash.property @:require(flash10_2) var color(get, set):UInt; + @:flash.property @:require(flash10) var colorCorrection(get, set):ColorCorrection; + @:flash.property @:require(flash10) var colorCorrectionSupport(get, never):ColorCorrectionSupport; + @:flash.property @:require(flash11_4) var contentsScaleFactor(get, never):Float; + #if air + @:flash.property var deviceOrientation(get, never):StageOrientation; + #end + @:flash.property @:require(flash11) var displayContextInfo(get, never):String; + @:flash.property var displayState(get, set):StageDisplayState; + @:flash.property var focus(get, set):InteractiveObject; + @:flash.property var frameRate(get, set):Float; + @:flash.property var fullScreenHeight(get, never):UInt; + @:flash.property var fullScreenSourceRect(get, set):flash.geom.Rectangle; + @:flash.property var fullScreenWidth(get, never):UInt; + @:flash.property @:require(flash11_2) var mouseLock(get, set):Bool; + #if air + @:flash.property var nativeWindow(get, never):NativeWindow; + @:flash.property var orientation(get, never):StageOrientation; + #end + @:flash.property var quality(get, set):StageQuality; + @:flash.property var scaleMode(get, set):StageScaleMode; + @:flash.property var showDefaultContextMenu(get, set):Bool; + @:flash.property @:require(flash11) var softKeyboardRect(get, never):flash.geom.Rectangle; + @:flash.property @:require(flash11) var stage3Ds(get, never):flash.Vector; + @:flash.property var stageFocusRect(get, set):Bool; + @:flash.property var stageHeight(get, set):Int; + @:flash.property @:require(flash10_2) var stageVideos(get, never):flash.Vector; + @:flash.property var stageWidth(get, set):Int; + #if air + @:flash.property var supportedOrientations(get, never):flash.Vector; + #end + @:flash.property @:require(flash10_1) var wmodeGPU(get, never):Bool; + @:flash.property static var supportsOrientationChange(get, never):Bool; + #end #if air function assignFocus(objectToFocus:InteractiveObject, direction:FocusDirection):Void; #end @@ -50,6 +94,61 @@ extern class Stage extends DisplayObjectContainer #if air function setAspectRatio(newAspectRatio:StageAspectRatio):Void; function setOrientation(newOrientation:StageOrientation):Void; - static var supportsOrientationChange(default, never):Bool; + #end + + #if (haxe_ver >= 4.3) + private function get_align():StageAlign; + private function get_allowsFullScreen():Bool; + private function get_allowsFullScreenInteractive():Bool; + private function get_browserZoomFactor():Float; + private function get_color():UInt; + private function get_colorCorrection():ColorCorrection; + private function get_colorCorrectionSupport():ColorCorrectionSupport; + private function get_constructor():Dynamic; + private function get_contentsScaleFactor():Float; + private function get_displayContextInfo():String; + private function get_displayState():StageDisplayState; + private function get_focus():InteractiveObject; + private function get_frameRate():Float; + private function get_fullScreenHeight():UInt; + private function get_fullScreenSourceRect():flash.geom.Rectangle; + private function get_fullScreenWidth():UInt; + private function get_mouseLock():Bool; + private function get_quality():StageQuality; + private function get_scaleMode():StageScaleMode; + private function get_showDefaultContextMenu():Bool; + private function get_softKeyboardRect():flash.geom.Rectangle; + private function get_stage3Ds():Vector; + private function get_stageFocusRect():Bool; + private function get_stageHeight():Int; + private function get_stageVideos():Vector; + private function get_stageWidth():Int; + private function get_wmodeGPU():Bool; + private function set_align(value:StageAlign):StageAlign; + private function set_color(value:UInt):UInt; + private function set_colorCorrection(value:ColorCorrection):ColorCorrection; + private function set_constructor(value:Dynamic):Dynamic; + private function set_displayState(value:StageDisplayState):StageDisplayState; + private function set_focus(value:InteractiveObject):InteractiveObject; + private function set_frameRate(value:Float):Float; + private function set_fullScreenSourceRect(value:flash.geom.Rectangle):flash.geom.Rectangle; + private function set_mouseLock(value:Bool):Bool; + private function set_quality(value:StageQuality):StageQuality; + private function set_scaleMode(value:StageScaleMode):StageScaleMode; + private function set_showDefaultContextMenu(value:Bool):Bool; + private function set_stageFocusRect(value:Bool):Bool; + private function set_stageHeight(value:Int):Int; + private function set_stageWidth(value:Int):Int; + #if air + private static function get_supportsOrientationChange():Bool; + private function get_autoOrients():Bool; + private function get_deviceOrientation():StageOrientation; + private function get_nativeWindow():NativeWindow; + private function get_orientation():StageOrientation; + private function get_supportedOrientations():Vector; + private function get_vsyncEnabled():Bool; + private function set_autoOrients(value:Bool):Bool; + private function set_vsyncEnabled(value:Bool):Bool; + #end #end } diff --git a/externs/air/flash/display/StageAspectRatio.hx b/externs/air/flash/display/StageAspectRatio.hx index 1777baba2..e663ce877 100644 --- a/externs/air/flash/display/StageAspectRatio.hx +++ b/externs/air/flash/display/StageAspectRatio.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.StageAspectRatio") -@:enum extern abstract StageAspectRatio(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageAspectRatio(String) { var ANY; var LANDSCAPE; diff --git a/externs/air/flash/display/StageOrientation.hx b/externs/air/flash/display/StageOrientation.hx index 5fc5fb0e8..bb85291a4 100644 --- a/externs/air/flash/display/StageOrientation.hx +++ b/externs/air/flash/display/StageOrientation.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.StageOrientation") -@:enum extern abstract StageOrientation(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageOrientation(String) { var DEFAULT; var ROTATED_LEFT; diff --git a/externs/air/flash/display3D/Context3DProfile.hx b/externs/air/flash/display3D/Context3DProfile.hx index 1a39d79b5..c7cec015d 100644 --- a/externs/air/flash/display3D/Context3DProfile.hx +++ b/externs/air/flash/display3D/Context3DProfile.hx @@ -1,7 +1,7 @@ package flash.display3D; @:native("flash.display3D.Context3DProfile") -@:enum extern abstract Context3DProfile(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract Context3DProfile(String) { var BASELINE; var BASELINE_CONSTRAINED; diff --git a/externs/air/flash/errors/SQLErrorOperation.hx b/externs/air/flash/errors/SQLErrorOperation.hx index 2d8494011..b0011cbad 100644 --- a/externs/air/flash/errors/SQLErrorOperation.hx +++ b/externs/air/flash/errors/SQLErrorOperation.hx @@ -1,7 +1,7 @@ package flash.errors; @:native("flash.errors.SQLErrorOperation") -@:enum extern abstract SQLErrorOperation(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLErrorOperation(String) { var ANALYZE; var ATTACH; diff --git a/externs/air/flash/events/KeyboardEvent.hx b/externs/air/flash/events/KeyboardEvent.hx index bca3fc270..116f82477 100644 --- a/externs/air/flash/events/KeyboardEvent.hx +++ b/externs/air/flash/events/KeyboardEvent.hx @@ -13,7 +13,7 @@ extern class KeyboardEvent extends Event var keyLocation:flash.ui.KeyLocation; var shiftKey:Bool; function new(type:String, bubbles:Bool = true, cancelable:Bool = false, charCodeValue:UInt = 0, keyCodeValue:UInt = 0, - keyLocationValue:flash.ui.KeyLocation = 0, ctrlKeyValue:Bool = false, altKeyValue:Bool = false, shiftKeyValue:Bool = false):Void; + keyLocationValue:flash.ui.KeyLocation = STANDARD, ctrlKeyValue:Bool = false, altKeyValue:Bool = false, shiftKeyValue:Bool = false):Void; function updateAfterEvent():Void; static var KEY_DOWN(default, never):String; static var KEY_UP(default, never):String; diff --git a/externs/air/flash/events/TouchEventIntent.hx b/externs/air/flash/events/TouchEventIntent.hx index 53e6dd1a1..7df2d0a5a 100644 --- a/externs/air/flash/events/TouchEventIntent.hx +++ b/externs/air/flash/events/TouchEventIntent.hx @@ -1,7 +1,7 @@ package flash.events; @:native("flash.events.TouchEventIntent") -@:enum extern abstract TouchEventIntent(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract TouchEventIntent(String) { var ERASER; var PEN; diff --git a/externs/air/flash/filesystem/FileMode.hx b/externs/air/flash/filesystem/FileMode.hx index 39247e9c3..db258317e 100644 --- a/externs/air/flash/filesystem/FileMode.hx +++ b/externs/air/flash/filesystem/FileMode.hx @@ -1,7 +1,7 @@ package flash.filesystem; @:native("flash.filesystem.FileMode") -@:enum extern abstract FileMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract FileMode(String) { var APPEND; var READ; diff --git a/externs/air/flash/filesystem/FileStream.hx b/externs/air/flash/filesystem/FileStream.hx index 426d84321..8948ce9cf 100644 --- a/externs/air/flash/filesystem/FileStream.hx +++ b/externs/air/flash/filesystem/FileStream.hx @@ -2,9 +2,16 @@ package flash.filesystem; extern class FileStream extends flash.events.EventDispatcher implements flash.utils.IDataInput implements flash.utils.IDataOutput { + #if (haxe_ver < 4.3) var bytesAvailable(default, never):UInt; var endian:flash.utils.Endian; var objectEncoding:#if openfl openfl.net.ObjectEncoding #else UInt #end; + #else + @:flash.property var bytesAvailable(get, never):UInt; + @:flash.property var endian(get, set):flash.utils.Endian; + @:flash.property var objectEncoding(get, set):#if openfl openfl.net.ObjectEncoding #else UInt #end; + #end + var position:Float; var readAhead:Float; function new():Void; @@ -38,4 +45,12 @@ extern class FileStream extends flash.events.EventDispatcher implements flash.ut function writeUTF(value:String):Void; function writeUTFBytes(value:String):Void; function writeUnsignedInt(value:UInt):Void; + + #if (haxe_ver >= 4.3) + private function get_bytesAvailable():UInt; + private function get_endian():flash.utils.Endian; + private function get_objectEncoding():#if openfl openfl.net.ObjectEncoding #else UInt #end; + private function set_endian(value:flash.utils.Endian):flash.utils.Endian; + private function set_objectEncoding(value:#if openfl openfl.net.ObjectEncoding #else UInt #end):#if openfl openfl.net.ObjectEncoding #else UInt #end; + #end } diff --git a/externs/air/flash/media/AudioPlaybackMode.hx b/externs/air/flash/media/AudioPlaybackMode.hx index 4fef3e6e8..600373424 100644 --- a/externs/air/flash/media/AudioPlaybackMode.hx +++ b/externs/air/flash/media/AudioPlaybackMode.hx @@ -1,7 +1,7 @@ package flash.media; @:native("flash.media.AudioPlaybackMode") -@:enum extern abstract AudioPlaybackMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract AudioPlaybackMode(String) { var AMBIENT; var MEDIA; diff --git a/externs/air/flash/media/CameraPosition.hx b/externs/air/flash/media/CameraPosition.hx index 54f61fe43..db892195e 100644 --- a/externs/air/flash/media/CameraPosition.hx +++ b/externs/air/flash/media/CameraPosition.hx @@ -1,7 +1,7 @@ package flash.media; @:native("flash.media.CameraPosition") -@:enum extern abstract CameraPosition(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract CameraPosition(String) { var BACK; var FRONT; diff --git a/externs/air/flash/media/MediaType.hx b/externs/air/flash/media/MediaType.hx index c4ff250b9..ca1b64cca 100644 --- a/externs/air/flash/media/MediaType.hx +++ b/externs/air/flash/media/MediaType.hx @@ -1,7 +1,7 @@ package flash.media; @:native("flash.media.MediaType") -@:enum extern abstract MediaType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract MediaType(String) { var IMAGE; var VIDEO; diff --git a/externs/air/flash/net/IPVersion.hx b/externs/air/flash/net/IPVersion.hx index 758ac83eb..b6c6abe50 100644 --- a/externs/air/flash/net/IPVersion.hx +++ b/externs/air/flash/net/IPVersion.hx @@ -1,7 +1,7 @@ package flash.net; @:native("flash.net.IPVersion") -@:enum extern abstract IPVersion(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract IPVersion(String) { var IPV4; var IPV6; diff --git a/externs/air/flash/net/Socket.hx b/externs/air/flash/net/Socket.hx index 375ed6c36..34eddbfcf 100644 --- a/externs/air/flash/net/Socket.hx +++ b/externs/air/flash/net/Socket.hx @@ -2,20 +2,33 @@ package flash.net; extern class Socket extends flash.events.EventDispatcher implements flash.utils.IDataOutput implements flash.utils.IDataInput { + #if (haxe_ver < 4.3) var bytesAvailable(default, never):UInt; @:require(flash11) var bytesPending(default, never):UInt; var connected(default, never):Bool; var endian:flash.utils.Endian; + var objectEncoding:UInt; + @:require(flash10) var timeout:UInt; #if air var localAddress(default, never):String; var localPort(default, never):Int; - #end - var objectEncoding:#if openfl openfl.net.ObjectEncoding #else UInt #end; - #if air var remoteAddress(default, never):String; var remotePort(default, never):Int; #end - @:require(flash10) var timeout:UInt; + #else + @:flash.property var bytesAvailable(get, never):UInt; + @:flash.property @:require(flash11) var bytesPending(get, never):UInt; + @:flash.property var connected(get, never):Bool; + @:flash.property var endian(get, set):flash.utils.Endian; + @:flash.property var objectEncoding(get, set):UInt; + @:flash.property @:require(flash10) var timeout(get, set):UInt; + #if air + @:flash.property var localAddress(get, never):String; + @:flash.property var localPort(get, never):Int; + @:flash.property var remoteAddress(get, never):String; + @:flash.property var remotePort(get, never):Int; + #end + #end function new(?host:String, port:Int = 0):Void; function close():Void; function connect(host:String, port:Int):Void; @@ -46,4 +59,22 @@ extern class Socket extends flash.events.EventDispatcher implements flash.utils. function writeUTF(value:String):Void; function writeUTFBytes(value:String):Void; function writeUnsignedInt(value:UInt):Void; + + #if (haxe_ver >= 4.3) + private function get_bytesAvailable():UInt; + private function get_bytesPending():UInt; + private function get_connected():Bool; + private function get_endian():flash.utils.Endian; + private function get_objectEncoding():UInt; + private function get_timeout():UInt; + #if air + private function get_localAddress():String; + private function get_localPort():Int; + private function get_remoteAddress():String; + private function get_remotePort():Int; + #end + private function set_endian(value:flash.utils.Endian):flash.utils.Endian; + private function set_objectEncoding(value:UInt):UInt; + private function set_timeout(value:UInt):UInt; + #end } diff --git a/externs/air/flash/notifications/NotificationStyle.hx b/externs/air/flash/notifications/NotificationStyle.hx index 49e12dcf0..35a3272ec 100644 --- a/externs/air/flash/notifications/NotificationStyle.hx +++ b/externs/air/flash/notifications/NotificationStyle.hx @@ -1,7 +1,7 @@ package flash.notifications; @:native("flash.notifications.NotificationStyle") -@:enum extern abstract NotificationStyle(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NotificationStyle(String) { var ALERT; var BADGE; diff --git a/externs/air/flash/printing/PaperSize.hx b/externs/air/flash/printing/PaperSize.hx index 9b415175d..2e50a25e3 100644 --- a/externs/air/flash/printing/PaperSize.hx +++ b/externs/air/flash/printing/PaperSize.hx @@ -1,7 +1,7 @@ package flash.printing; @:native("flash.printing.PaperSize") -@:enum extern abstract PaperSize(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract PaperSize(String) { var A4; var A5; diff --git a/externs/air/flash/printing/PrintMethod.hx b/externs/air/flash/printing/PrintMethod.hx index 6f2f4d2af..c8f57b03d 100644 --- a/externs/air/flash/printing/PrintMethod.hx +++ b/externs/air/flash/printing/PrintMethod.hx @@ -1,7 +1,7 @@ package flash.printing; @:native("flash.printing.PrintMethod") -@:enum extern abstract PrintMethod(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract PrintMethod(String) { var AUTO; var BITMAP; diff --git a/externs/air/flash/security/ReferencesValidationSetting.hx b/externs/air/flash/security/ReferencesValidationSetting.hx index affc25b9c..1c946d554 100644 --- a/externs/air/flash/security/ReferencesValidationSetting.hx +++ b/externs/air/flash/security/ReferencesValidationSetting.hx @@ -1,7 +1,7 @@ package flash.security; @:native("flash.security.ReferencesValidationSetting") -@:enum extern abstract ReferencesValidationSetting(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract ReferencesValidationSetting(String) { var NEVER; var VALID_IDENTITY; diff --git a/externs/air/flash/security/RevocationCheckSettings.hx b/externs/air/flash/security/RevocationCheckSettings.hx index cd6b2b522..6bfeb017f 100644 --- a/externs/air/flash/security/RevocationCheckSettings.hx +++ b/externs/air/flash/security/RevocationCheckSettings.hx @@ -1,7 +1,7 @@ package flash.security; @:native("flash.security.RevocationCheckSettings") -@:enum extern abstract RevocationCheckSettings(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract RevocationCheckSettings(String) { var ALWAYS_REQUIRED; var BEST_EFFORT; diff --git a/externs/air/flash/security/SignatureStatus.hx b/externs/air/flash/security/SignatureStatus.hx index edbc6eb32..a8df8686b 100644 --- a/externs/air/flash/security/SignatureStatus.hx +++ b/externs/air/flash/security/SignatureStatus.hx @@ -1,7 +1,7 @@ package flash.security; @:native("flash.security.SignatureStatus") -@:enum extern abstract SignatureStatus(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SignatureStatus(String) { var INVALID; var UNKNOWN; diff --git a/externs/air/flash/security/SignerTrustSettings.hx b/externs/air/flash/security/SignerTrustSettings.hx index 75beb3af8..9c3ab6c5f 100644 --- a/externs/air/flash/security/SignerTrustSettings.hx +++ b/externs/air/flash/security/SignerTrustSettings.hx @@ -1,7 +1,7 @@ package flash.security; @:native("flash.security.SignerTrustSettings") -@:enum extern abstract SignerTrustSettings(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SignerTrustSettings(String) { var CODE_SIGNING; var PLAYLIST_SIGNING; diff --git a/externs/air/flash/text/AutoCapitalize.hx b/externs/air/flash/text/AutoCapitalize.hx index bcdb29f85..9c47c449d 100644 --- a/externs/air/flash/text/AutoCapitalize.hx +++ b/externs/air/flash/text/AutoCapitalize.hx @@ -1,7 +1,7 @@ package flash.text; @:native("flash.text.AutoCapitalize") -@:enum extern abstract AutoCapitalize(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract AutoCapitalize(String) { var ALL; var NONE; diff --git a/externs/air/flash/text/ReturnKeyLabel.hx b/externs/air/flash/text/ReturnKeyLabel.hx index 6f138a34d..598b406e3 100644 --- a/externs/air/flash/text/ReturnKeyLabel.hx +++ b/externs/air/flash/text/ReturnKeyLabel.hx @@ -1,7 +1,7 @@ package flash.text; @:native("flash.text.ReturnKeyLabel") -@:enum extern abstract ReturnKeyLabel(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract ReturnKeyLabel(String) { var DEFAULT; var DONE; diff --git a/externs/air/flash/text/SoftKeyboardType.hx b/externs/air/flash/text/SoftKeyboardType.hx index 27da6308a..d2080237b 100644 --- a/externs/air/flash/text/SoftKeyboardType.hx +++ b/externs/air/flash/text/SoftKeyboardType.hx @@ -1,7 +1,7 @@ package flash.text; @:native("flash.text.SoftKeyboardType") -@:enum extern abstract SoftKeyboardType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SoftKeyboardType(String) { var CONTACT; var DEFAULT; diff --git a/externs/air/flash/text/StageTextClearButtonMode.hx b/externs/air/flash/text/StageTextClearButtonMode.hx index fdb945a1e..c084af6b6 100644 --- a/externs/air/flash/text/StageTextClearButtonMode.hx +++ b/externs/air/flash/text/StageTextClearButtonMode.hx @@ -1,7 +1,7 @@ package flash.text; @:native("flash.text.StageTextClearButtonMode") -@:enum extern abstract StageTextClearButtonMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageTextClearButtonMode(String) { var ALWAYS; var NEVER; diff --git a/project/Build.xml b/project/Build.xml index 3abd5b2b1..202bc542c 100644 --- a/project/Build.xml +++ b/project/Build.xml @@ -331,14 +331,14 @@ - + - + @@ -456,6 +456,7 @@ + diff --git a/project/lib/curl b/project/lib/curl index c1b5625ed..462196e6b 160000 --- a/project/lib/curl +++ b/project/lib/curl @@ -1 +1 @@ -Subproject commit c1b5625eda29bcfeb344e6bfc18c7da3a009cbf2 +Subproject commit 462196e6b4a47f924293a0e26b8e9c23d37ac26f diff --git a/project/lib/curl-files.xml b/project/lib/curl-files.xml new file mode 100644 index 000000000..432aa28f7 --- /dev/null +++ b/project/lib/curl-files.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/lib/custom/curl/lib/curl_config.h b/project/lib/custom/curl/lib/curl_config.h new file mode 100644 index 000000000..c45bcc57f --- /dev/null +++ b/project/lib/custom/curl/lib/curl_config.h @@ -0,0 +1,1056 @@ +/* lib/curl_config.h. Generated from curl_config.h.in by configure. */ +/* lib/curl_config.h.in. Generated from configure.ac by autoheader. */ + +/* Location of default ca bundle */ +/* #define CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" */ + +/* define "1" to use built in CA store of SSL library */ +/* #undef CURL_CA_FALLBACK */ + +/* Location of default ca path */ +/* #undef CURL_CA_PATH */ + +/* Default SSL backend */ +/* #undef CURL_DEFAULT_SSL_BACKEND */ + +/* to disable cookies support */ +/* #undef CURL_DISABLE_COOKIES */ + +/* to disable cryptographic authentication */ +/* #undef CURL_DISABLE_CRYPTO_AUTH */ + +/* to disable DICT */ +/* #undef CURL_DISABLE_DICT */ + +/* to disable FILE */ +/* #undef CURL_DISABLE_FILE */ + +/* to disable FTP */ +/* #undef CURL_DISABLE_FTP */ + +/* to disable Gopher */ +/* #undef CURL_DISABLE_GOPHER */ + +/* to disable HTTP */ +/* #undef CURL_DISABLE_HTTP */ + +/* to disable IMAP */ +/* #undef CURL_DISABLE_IMAP */ + +/* to disable LDAP */ +#define CURL_DISABLE_LDAP 1 + +/* to disable LDAPS */ +#define CURL_DISABLE_LDAPS 1 + +/* to disable --libcurl C code generation option */ +/* #undef CURL_DISABLE_LIBCURL_OPTION */ + +/* to disable POP3 */ +/* #undef CURL_DISABLE_POP3 */ + +/* to disable proxies */ +/* #undef CURL_DISABLE_PROXY */ + +/* to disable RTSP */ +/* #undef CURL_DISABLE_RTSP */ + +/* to disable SMB/CIFS */ +/* #undef CURL_DISABLE_SMB */ + +/* to disable SMTP */ +/* #undef CURL_DISABLE_SMTP */ + +/* to disable TELNET */ +/* #undef CURL_DISABLE_TELNET */ + +/* to disable TFTP */ +/* #undef CURL_DISABLE_TFTP */ + +/* to disable TLS-SRP authentication */ +/* #undef CURL_DISABLE_TLS_SRP */ + +/* to disable verbose strings */ +/* #undef CURL_DISABLE_VERBOSE_STRINGS */ + +/* Definition to make a library symbol externally visible. */ +/* #define CURL_EXTERN_SYMBOL __attribute__ ((__visibility__ ("default"))) */ + +/* built with multiple SSL backends */ +/* #undef CURL_WITH_MULTI_SSL */ + +/* your Entropy Gathering Daemon socket pathname */ +/* #undef EGD_SOCKET */ + +/* Define if you want to enable IPv6 support */ +#define ENABLE_IPV6 1 + +/* Define to the type of arg 2 for gethostname. */ +#define GETHOSTNAME_TYPE_ARG2 size_t + +/* Define to the type qualifier of arg 1 for getnameinfo. */ +#define GETNAMEINFO_QUAL_ARG1 const + +/* Define to the type of arg 1 for getnameinfo. */ +#define GETNAMEINFO_TYPE_ARG1 struct sockaddr * + +/* Define to the type of arg 2 for getnameinfo. */ +#define GETNAMEINFO_TYPE_ARG2 socklen_t + +/* Define to the type of args 4 and 6 for getnameinfo. */ +#define GETNAMEINFO_TYPE_ARG46 socklen_t + +/* Define to the type of arg 7 for getnameinfo. */ +#define GETNAMEINFO_TYPE_ARG7 int + +/* Specifies the number of arguments to getservbyport_r */ +/* #define GETSERVBYPORT_R_ARGS 6 */ + +/* Specifies the size of the buffer to pass to getservbyport_r */ +/* #define GETSERVBYPORT_R_BUFSIZE 4096 */ + +/* Define to 1 if you have the alarm function. */ +#define HAVE_ALARM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ALLOCA_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_TFTP_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define to 1 if you have the basename function. */ +#define HAVE_BASENAME 1 + +/* Define to 1 if bool is an available type. */ +#define HAVE_BOOL_T 1 + +/* Define to 1 if using BoringSSL. */ +/* #undef HAVE_BORINGSSL */ + +/* Define to 1 if you have the __builtin_available function. */ +/* #undef HAVE_BUILTIN_AVAILABLE */ + +/* Define to 1 if you have the clock_gettime function and monotonic timer. */ +#ifdef HX_LINUX +#define HAVE_CLOCK_GETTIME_MONOTONIC 1 +#else +/* #undef HAVE_CLOCK_GETTIME_MONOTONIC */ +#endif + +/* Define to 1 if you have the closesocket function. */ +/* #undef HAVE_CLOSESOCKET */ + +/* Define to 1 if you have the CloseSocket camel case function. */ +/* #undef HAVE_CLOSESOCKET_CAMEL */ + +/* Define to 1 if you have the connect function. */ +#define HAVE_CONNECT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRYPTO_H */ + +/* Define to 1 if you have the `CyaSSL_CTX_UseSupportedCurve' function. */ +/* #undef HAVE_CYASSL_CTX_USESUPPORTEDCURVE */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CYASSL_ERROR_SSL_H */ + +/* Define to 1 if you have the `CyaSSL_get_peer_certificate' function. */ +/* #undef HAVE_CYASSL_GET_PEER_CERTIFICATE */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CYASSL_OPTIONS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `ENGINE_cleanup' function. */ +/* #undef HAVE_ENGINE_CLEANUP */ + +/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */ +/* #undef HAVE_ENGINE_LOAD_BUILTIN_ENGINES */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ERR_H */ + +/* Define to 1 if you have the fcntl function. */ +#define HAVE_FCNTL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have a working fcntl O_NONBLOCK function. */ +#define HAVE_FCNTL_O_NONBLOCK 1 + +/* Define to 1 if you have the fdopen function. */ +#define HAVE_FDOPEN 1 + +/* Define to 1 if you have the freeaddrinfo function. */ +#define HAVE_FREEADDRINFO 1 + +/* Define to 1 if you have the freeifaddrs function. */ +#define HAVE_FREEIFADDRS 1 + +/* Define to 1 if you have the fsetxattr function. */ +#define HAVE_FSETXATTR 1 + +/* fsetxattr() takes 5 args */ +#define HAVE_FSETXATTR_5 1 + +/* fsetxattr() takes 6 args */ +/* #undef HAVE_FSETXATTR_6 */ + +/* Define to 1 if you have the ftruncate function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the gai_strerror function. */ +/* #define HAVE_GAI_STRERROR 1 */ + +/* Define to 1 if you have a working getaddrinfo function. */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if the getaddrinfo function is threadsafe. */ +#define HAVE_GETADDRINFO_THREADSAFE 1 + +/* Define to 1 if you have the `geteuid' function. */ +#define HAVE_GETEUID 1 + +/* Define to 1 if you have the gethostbyaddr function. */ +#define HAVE_GETHOSTBYADDR 1 + +/* Define to 1 if you have the gethostbyaddr_r function. */ +/* #undef HAVE_GETHOSTBYADDR_R */ + +/* gethostbyaddr_r() takes 5 args */ +/* #undef HAVE_GETHOSTBYADDR_R_5 */ + +/* gethostbyaddr_r() takes 7 args */ +/* #undef HAVE_GETHOSTBYADDR_R_7 */ + +/* gethostbyaddr_r() takes 8 args */ +/* #undef HAVE_GETHOSTBYADDR_R_8 */ + +/* Define to 1 if you have the gethostbyname function. */ +#define HAVE_GETHOSTBYNAME 1 + +/* Define to 1 if you have the gethostbyname_r function. */ +/* #undef HAVE_GETHOSTBYNAME_R */ + +/* gethostbyname_r() takes 3 args */ +/* #undef HAVE_GETHOSTBYNAME_R_3 */ + +/* gethostbyname_r() takes 5 args */ +/* #undef HAVE_GETHOSTBYNAME_R_5 */ + +/* gethostbyname_r() takes 6 args */ +/* #undef HAVE_GETHOSTBYNAME_R_6 */ + +/* Define to 1 if you have the gethostname function. */ +#define HAVE_GETHOSTNAME 1 + +/* Define to 1 if you have a working getifaddrs function. */ +#if !defined(ANDROID) && !defined(HX_LINUX) && !defined(WEBOS) && !defined(BLACKBERRY) && !defined(TIZEN) +#define HAVE_GETIFADDRS 1 +#endif + +/* Define to 1 if you have the getnameinfo function. */ +#define HAVE_GETNAMEINFO 1 + +/* Define to 1 if you have the `getpass_r' function. */ +/* #undef HAVE_GETPASS_R */ + +/* Define to 1 if you have the `getppid' function. */ +#define HAVE_GETPPID 1 + +/* Define to 1 if you have the `getpwuid' function. */ +#define HAVE_GETPWUID 1 + +/* Define to 1 if you have the `getpwuid_r' function. */ +/* #define HAVE_GETPWUID_R 1 */ + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define to 1 if you have the getservbyport_r function. */ +/* #undef HAVE_GETSERVBYPORT_R */ + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have a working glibc-style strerror_r function. */ +/* #undef HAVE_GLIBC_STRERROR_R */ + +/* Define to 1 if you have a working gmtime_r function. */ +#define HAVE_GMTIME_R 1 + +/* Define to 1 if you have the `gnutls_alpn_set_protocols' function. */ +/* #undef HAVE_GNUTLS_ALPN_SET_PROTOCOLS */ + +/* Define to 1 if you have the `gnutls_certificate_set_x509_key_file2' + function. */ +/* #undef HAVE_GNUTLS_CERTIFICATE_SET_X509_KEY_FILE2 */ + +/* Define to 1 if you have the `gnutls_ocsp_req_init' function. */ +/* #undef HAVE_GNUTLS_OCSP_REQ_INIT */ + +/* if you have the function gnutls_srp_verifier */ +/* #undef HAVE_GNUTLS_SRP */ + +/* if you have GSS-API libraries */ +/* #undef HAVE_GSSAPI */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */ + +/* if you have GNU GSS */ +/* #undef HAVE_GSSGNU */ + +/* if you have Heimdal */ +/* #undef HAVE_GSSHEIMDAL */ + +/* if you have MIT Kerberos */ +/* #undef HAVE_GSSMIT */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IDN2_H */ + +/* Define to 1 if you have the header file. */ +#if !defined(ANDROID) && !defined(HX_LINUX) && !defined(WEBOS) && !defined(BLACKBERRY) && !defined(TIZEN) +#define HAVE_IFADDRS_H 1 +#endif + +/* Define to 1 if you have the `if_nametoindex' function. */ +/* #define HAVE_IF_NAMETOINDEX 1 */ + +/* Define to 1 if you have the inet_ntoa_r function. */ +/* #undef HAVE_INET_NTOA_R */ + +/* inet_ntoa_r() takes 2 args */ +/* #undef HAVE_INET_NTOA_R_2 */ + +/* inet_ntoa_r() takes 3 args */ +/* #undef HAVE_INET_NTOA_R_3 */ + +/* Define to 1 if you have a IPv6 capable working inet_ntop function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have a IPv6 capable working inet_pton function. */ +#define HAVE_INET_PTON 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the ioctl function. */ +#define HAVE_IOCTL 1 + +/* Define to 1 if you have the ioctlsocket function. */ +/* #undef HAVE_IOCTLSOCKET */ + +/* Define to 1 if you have the IoctlSocket camel case function. */ +/* #undef HAVE_IOCTLSOCKET_CAMEL */ + +/* Define to 1 if you have a working IoctlSocket camel case FIONBIO function. + */ +/* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */ + +/* Define to 1 if you have a working ioctlsocket FIONBIO function. */ +/* #undef HAVE_IOCTLSOCKET_FIONBIO */ + +/* Define to 1 if you have a working ioctl FIONBIO function. */ +#define HAVE_IOCTL_FIONBIO 1 + +/* Define to 1 if you have a working ioctl SIOCGIFADDR function. */ +#define HAVE_IOCTL_SIOCGIFADDR 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IO_H */ + +/* Define to 1 if you have the lber.h header file. */ +/* #undef HAVE_LBER_H */ + +/* Define to 1 if you have the ldapssl.h header file. */ +/* #undef HAVE_LDAPSSL_H */ + +/* Define to 1 if you have the ldap.h header file. */ +/* #undef HAVE_LDAP_H */ + +/* Define to 1 if you have the `ldap_init_fd' function. */ +/* #undef HAVE_LDAP_INIT_FD */ + +/* Use LDAPS implementation */ +/* #undef HAVE_LDAP_SSL */ + +/* Define to 1 if you have the ldap_ssl.h header file. */ +/* #undef HAVE_LDAP_SSL_H */ + +/* Define to 1 if you have the `ldap_url_parse' function. */ +/* #undef HAVE_LDAP_URL_PARSE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIBGEN_H 1 + +/* Define to 1 if you have the `idn2' library (-lidn2). */ +/* #undef HAVE_LIBIDN2 */ + +/* Define to 1 if using libressl. */ +/* #undef HAVE_LIBRESSL */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBRTMP_RTMP_H */ + +/* Define to 1 if you have the `ssh2' library (-lssh2). */ +/* #undef HAVE_LIBSSH2 */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBSSH2_H */ + +/* Define to 1 if you have the `ssl' library (-lssl). */ +/* #undef HAVE_LIBSSL */ + +/* if zlib is available */ +#define HAVE_LIBZ 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* if your compiler supports LL */ +#define HAVE_LL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have a working localtime_r function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define to 1 if the compiler supports the 'long long' data type. */ +#define HAVE_LONGLONG 1 + +/* Define to 1 if you have the malloc.h header file. */ +/* #undef HAVE_MALLOC_H */ + +/* Define to 1 if you have the memory.h header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the memrchr function or macro. */ +/* #undef HAVE_MEMRCHR */ + +/* Define to 1 if you have the MSG_NOSIGNAL flag. */ +/* #undef HAVE_MSG_NOSIGNAL */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_TCP_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NET_IF_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NGHTTP2_NGHTTP2_H */ + +/* Define to 1 if NI_WITHSCOPEID exists and works. */ +/* #undef HAVE_NI_WITHSCOPEID */ + +/* if you have an old MIT Kerberos version, lacking GSS_C_NT_HOSTBASED_SERVICE + */ +/* #undef HAVE_OLD_GSSMIT */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_CRYPTO_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_ENGINE_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_ERR_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_PEM_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_RSA_H */ + +/* if you have the function SRP_Calc_client_key */ +/* #undef HAVE_OPENSSL_SRP */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_SSL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OPENSSL_X509_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PEM_H */ + +/* Define to 1 if you have the `pipe' function. */ +#define HAVE_PIPE 1 + +/* Define to 1 if you have a working poll function. */ +/* #undef HAVE_POLL */ + +/* If you have a fine poll */ +/* #undef HAVE_POLL_FINE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define to 1 if you have a working POSIX-style strerror_r function. */ +#define HAVE_POSIX_STRERROR_R 1 + +/* if you have */ +#define HAVE_PTHREAD_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PWD_H 1 + +/* Define to 1 if you have the `RAND_egd' function. */ +/* #undef HAVE_RAND_EGD */ + +/* Define to 1 if you have the recv function. */ +#define HAVE_RECV 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_RSA_H */ + +/* Define to 1 if you have the select function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the send function. */ +#define HAVE_SEND 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SETJMP_H 1 + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the `setmode' function. */ +/* #undef HAVE_SETMODE */ + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the setsockopt function. */ +#define HAVE_SETSOCKOPT 1 + +/* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */ +/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SGTTY_H 1 + +/* Define to 1 if you have the sigaction function. */ +#define HAVE_SIGACTION 1 + +/* Define to 1 if you have the siginterrupt function. */ +#define HAVE_SIGINTERRUPT 1 + +/* Define to 1 if you have the signal function. */ +#define HAVE_SIGNAL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the sigsetjmp function or macro. */ +#ifndef ANDROID_X86 +#define HAVE_SIGSETJMP 1 +#endif + +/* Define to 1 if sig_atomic_t is an available typedef. */ +#define HAVE_SIG_ATOMIC_T 1 + +/* Define to 1 if sig_atomic_t is already defined as volatile. */ +/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */ + +/* Define to 1 if struct sockaddr_in6 has the sin6_scope_id member */ +#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 + +/* Define to 1 if you have the socket function. */ +#define HAVE_SOCKET 1 + +/* Define to 1 if you have the socketpair function. */ +#define HAVE_SOCKETPAIR 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SOCKET_H */ + +/* Define to 1 if you have the `SSLv2_client_method' function. */ +/* #undef HAVE_SSLV2_CLIENT_METHOD */ + +/* Define to 1 if you have the `SSL_get_shutdown' function. */ +/* #undef HAVE_SSL_GET_SHUTDOWN */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SSL_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the strcasecmp function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the strcmpi function. */ +/* #undef HAVE_STRCMPI */ + +/* Define to 1 if you have the strdup function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the strerror_r function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the stricmp function. */ +/* #undef HAVE_STRICMP */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the strncasecmp function. */ +#define HAVE_STRNCASECMP 1 + +/* Define to 1 if you have the strncmpi function. */ +/* #undef HAVE_STRNCMPI */ + +/* Define to 1 if you have the strnicmp function. */ +/* #undef HAVE_STRNICMP */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STROPTS_H */ + +/* Define to 1 if you have the strstr function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the strtok_r function. */ +#define HAVE_STRTOK_R 1 + +/* Define to 1 if you have the strtoll function. */ +#define HAVE_STRTOLL 1 + +/* if struct sockaddr_storage is defined */ +#define HAVE_STRUCT_SOCKADDR_STORAGE 1 + +/* Define to 1 if you have the timeval struct. */ +#define HAVE_STRUCT_TIMEVAL 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_FILIO_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_POLL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#if !defined(ANDROID) && !defined(HX_LINUX) && !defined(WEBOS) && !defined(BLACKBERRY) && !defined(TIZEN) +#define HAVE_SYS_SOCKIO_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UN_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_UTIME_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_XATTR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_TERMIO_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `utime' function. */ +#define HAVE_UTIME 1 + +/* Define to 1 if you have the `utimes' function. */ +#define HAVE_UTIMES 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UTIME_H 1 + +/* Define to 1 if compiler supports C99 variadic macro style. */ +#define HAVE_VARIADIC_MACROS_C99 1 + +/* Define to 1 if compiler supports old gcc variadic macro style. */ +#define HAVE_VARIADIC_MACROS_GCC 1 + +/* Define to 1 if you have the winber.h header file. */ +/* #undef HAVE_WINBER_H */ + +/* Define to 1 if you have the windows.h header file. */ +/* #undef HAVE_WINDOWS_H */ + +/* Define to 1 if you have the winldap.h header file. */ +/* #undef HAVE_WINLDAP_H */ + +/* Define to 1 if you have the winsock2.h header file. */ +/* #undef HAVE_WINSOCK2_H */ + +/* Define to 1 if you have the winsock.h header file. */ +/* #undef HAVE_WINSOCK_H */ + +/* Define to 1 if you have the `wolfSSLv3_client_method' function. */ +/* #undef HAVE_WOLFSSLV3_CLIENT_METHOD */ + +/* Define to 1 if you have the `wolfSSL_CTX_UseSupportedCurve' function. */ +/* #undef HAVE_WOLFSSL_CTX_USESUPPORTEDCURVE */ + +/* Define to 1 if you have the `wolfSSL_get_peer_certificate' function. */ +/* #undef HAVE_WOLFSSL_GET_PEER_CERTIFICATE */ + +/* Define to 1 if you have the `wolfSSL_UseALPN' function. */ +/* #undef HAVE_WOLFSSL_USEALPN */ + +/* Define this symbol if your OS supports changing the contents of argv */ +#define HAVE_WRITABLE_ARGV 1 + +/* Define to 1 if you have the writev function. */ +#define HAVE_WRITEV 1 + +/* Define to 1 if you have the ws2tcpip.h header file. */ +/* #undef HAVE_WS2TCPIP_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_X509_H */ + +/* if you have the zlib.h header file */ +#define HAVE_ZLIB_H 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 if you need the lber.h header file even with ldap.h */ +/* #undef NEED_LBER_H */ + +/* Define to 1 if you need the malloc.h header file even with stdlib.h */ +/* #undef NEED_MALLOC_H */ + +/* Define to 1 if you need the memory.h header file even with stdlib.h */ +/* #undef NEED_MEMORY_H */ + +/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */ +/* #undef NEED_REENTRANT */ + +/* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */ +/* #undef NEED_THREAD_SAFE */ + +/* Define to enable NTLM delegation to winbind's ntlm_auth helper. */ +/* #define NTLM_WB_ENABLED 1 */ + +/* Define absolute filename for winbind's ntlm_auth helper. */ +/* #define NTLM_WB_FILE "/usr/bin/ntlm_auth" */ + +/* cpu-machine-OS */ +#define OS "x86_64-pc-linux-gnu" + +/* Name of package */ +#define PACKAGE "curl" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.haxx.se/mail/" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "curl" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "curl -" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "curl" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "-" + +/* a suitable file to read random data from */ +#ifdef HX_LINUX +#define RANDOM_FILE "/dev/urandom" +#else +/* #undef RANDOM_FILE */ +#endif + +/* Define to the type of arg 1 for recv. */ +#define RECV_TYPE_ARG1 int + +/* Define to the type of arg 2 for recv. */ +#define RECV_TYPE_ARG2 void * + +/* Define to the type of arg 3 for recv. */ +#define RECV_TYPE_ARG3 size_t + +/* Define to the type of arg 4 for recv. */ +#define RECV_TYPE_ARG4 int + +/* Define to the function return type for recv. */ +#define RECV_TYPE_RETV ssize_t + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* Define to the type qualifier of arg 5 for select. */ +#define SELECT_QUAL_ARG5 + +/* Define to the type of arg 1 for select. */ +#define SELECT_TYPE_ARG1 int + +/* Define to the type of args 2, 3 and 4 for select. */ +#define SELECT_TYPE_ARG234 fd_set * + +/* Define to the type of arg 5 for select. */ +#define SELECT_TYPE_ARG5 struct timeval * + +/* Define to the function return type for select. */ +#define SELECT_TYPE_RETV int + +/* Define to the type qualifier of arg 2 for send. */ +#define SEND_QUAL_ARG2 const + +/* Define to the type of arg 1 for send. */ +#define SEND_TYPE_ARG1 int + +/* Define to the type of arg 2 for send. */ +#define SEND_TYPE_ARG2 void * + +/* Define to the type of arg 3 for send. */ +#define SEND_TYPE_ARG3 size_t + +/* Define to the type of arg 4 for send. */ +#define SEND_TYPE_ARG4 int + +/* Define to the function return type for send. */ +#define SEND_TYPE_RETV ssize_t + +/* The size of `curl_off_t', as computed by sizeof. */ +#define SIZEOF_CURL_OFF_T 8 + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#ifdef HXCPP_M64 +#define SIZEOF_LONG 8 +#else +#define SIZEOF_LONG 4 +#endif + +/* The size of `long long', as computed by sizeof. */ +/* #undef SIZEOF_LONG_LONG */ + +/* The size of `off_t', as computed by sizeof. */ +#define SIZEOF_OFF_T 8 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* The size of `size_t', as computed by sizeof. */ +#ifdef HXCPP_M64 +#define SIZEOF_SIZE_T 8 +#else +#define SIZEOF_SIZE_T 4 +#endif + +/* The size of `time_t', as computed by sizeof. */ +#ifdef HXCPP_M64 +#define SIZEOF_TIME_T 8 +#else +#define SIZEOF_TIME_T 4 +#endif + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to the type of arg 3 for strerror_r. */ +#define STRERROR_R_TYPE_ARG3 size_t + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Define to enable c-ares support */ +/* #undef USE_ARES */ + +/* if axTLS is enabled */ +/* #undef USE_AXTLS */ + +/* if CyaSSL/WolfSSL is enabled */ +/* #undef USE_CYASSL */ + +/* to enable Apple OS native SSL/TLS support */ +/* #undef USE_DARWINSSL */ + +/* if GnuTLS is enabled */ +/* #undef USE_GNUTLS */ + +/* if GnuTLS uses nettle as crypto backend */ +/* #undef USE_GNUTLS_NETTLE */ + +/* PSL support enabled */ +/* #undef USE_LIBPSL */ + +/* if librtmp is in use */ +/* #undef USE_LIBRTMP */ + +/* if libSSH2 is in use */ +/* #undef USE_LIBSSH2 */ + +/* If you want to build curl with the built-in manual */ +#define USE_MANUAL 1 + +/* if mbedTLS is enabled */ +/* #undef USE_MBEDTLS */ + +/* Define to enable metalink support */ +/* #undef USE_METALINK */ + +/* if nghttp2 is in use */ +/* #undef USE_NGHTTP2 */ + +/* if NSS is enabled */ +/* #undef USE_NSS */ + +/* Use OpenLDAP-specific code */ +/* #undef USE_OPENLDAP */ + +/* if OpenSSL is in use */ +/* #undef USE_OPENSSL */ + +/* if PolarSSL is enabled */ +/* #undef USE_POLARSSL */ + +/* to enable Windows native SSL/TLS support */ +/* #undef USE_SCHANNEL */ + +/* if you want POSIX threaded DNS lookup */ +/* #define USE_THREADS_POSIX 1 */ + +/* if you want Win32 threaded DNS lookup */ +/* #undef USE_THREADS_WIN32 */ + +/* Use TLS-SRP authentication */ +/* #undef USE_TLS_SRP */ + +/* Use Unix domain sockets */ +/* #define USE_UNIX_SOCKETS 1 */ + +/* Define to 1 if you have the `normaliz' (WinIDN) library (-lnormaliz). */ +/* #undef USE_WIN32_IDN */ + +/* Define to 1 if you are building a Windows target with large file support. + */ +/* #undef USE_WIN32_LARGE_FILES */ + +/* Use Windows LDAP implementation */ +/* #undef USE_WIN32_LDAP */ + +/* Define to 1 if you are building a Windows target without large file + support. */ +/* #undef USE_WIN32_SMALL_FILES */ + +/* to enable SSPI support */ +/* #undef USE_WINDOWS_SSPI */ + +/* Version number of package */ +#define VERSION "7.56.1" + +/* Define to 1 to provide own prototypes. */ +/* #undef WANT_IDN_PROTOTYPES */ + +/* Define to 1 if OS is AIX. */ +#ifndef _ALL_SOURCE +/* # undef _ALL_SOURCE */ +#endif + +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Type to use in place of in_addr_t when system does not provide it. */ +/* #undef in_addr_t */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* the signed version of size_t */ +/* #undef ssize_t */ \ No newline at end of file diff --git a/project/lib/mbedtls b/project/lib/mbedtls index 2014806c6..8c8922499 160000 --- a/project/lib/mbedtls +++ b/project/lib/mbedtls @@ -1 +1 @@ -Subproject commit 2014806c66f52e1dcadcf02b2fdda48d798b2fc1 +Subproject commit 8c89224991adff88d53cd380f42a2baa36f91454 diff --git a/project/lib/mbedtls-files.xml b/project/lib/mbedtls-files.xml new file mode 100644 index 000000000..1fafa5edd --- /dev/null +++ b/project/lib/mbedtls-files.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/lime/_internal/backend/kha/KhaApplication.hx b/src/lime/_internal/backend/kha/KhaApplication.hx new file mode 100644 index 000000000..85cefebd0 --- /dev/null +++ b/src/lime/_internal/backend/kha/KhaApplication.hx @@ -0,0 +1,537 @@ +package lime._internal.backend.kha; + +import haxe.Timer; +import lime.app.Application; +import lime.app.Config; +import lime.media.AudioManager; +import lime.graphics.RenderContext; +import lime.graphics.Renderer; +import lime.math.Rectangle; +import lime.system.Clipboard; +import lime.system.Display; +import lime.system.DisplayMode; +import lime.system.JNI; +import lime.system.Sensor; +import lime.system.SensorType; +import lime.system.System; +import lime.ui.Gamepad; +import lime.ui.Joystick; +import lime.ui.JoystickHatPosition; +import lime.ui.KeyCode; +import lime.ui.KeyModifier; +import lime.ui.Touch; +import lime.ui.Window; +import openfl._internal.renderer.kha.KhaRenderer; + +#if !lime_debug +@:fileXml('tags="haxe,release"') +@:noDebug +#end +@:access(haxe.Timer) +@:access(lime.app.Application) +@:access(lime.graphics.Renderer) +@:access(lime.system.Clipboard) +@:access(lime.system.Sensor) +@:access(lime.ui.Gamepad) +@:access(lime.ui.Joystick) +@:access(lime.ui.Window) +class KhaApplication +{ + private var applicationEventInfo = new ApplicationEventInfo(UPDATE); + private var clipboardEventInfo = new ClipboardEventInfo(); + private var currentTouches = new Map(); + private var dropEventInfo = new DropEventInfo(); + private var gamepadEventInfo = new GamepadEventInfo(); + private var joystickEventInfo = new JoystickEventInfo(); + private var keyEventInfo = new KeyEventInfo(); + private var mouseEventInfo = new MouseEventInfo(); + private var renderEventInfo = new RenderEventInfo(RENDER); + private var sensorEventInfo = new SensorEventInfo(); + private var textEventInfo = new TextEventInfo(); + private var touchEventInfo = new TouchEventInfo(); + private var unusedTouchesPool = new List(); + private var windowEventInfo = new WindowEventInfo(); + + public var handle:Dynamic; + + private var frameRate:Float; + private var parent:Application; + private var toggleFullscreen:Bool; + + private static function __init__() {} + + public function new(parent:Application):Void + { + this.parent = parent; + frameRate = 60; + toggleFullscreen = true; + } + + public function create(config:Config):Void {} + + public function exec():Int + { + #if !macro + kha.input.Mouse.get().notify(mouseDown, mouseUp, mouseMove, mouseWheel); + + kha.System.notifyOnRender(function(framebuffer:kha.Framebuffer) + { + for (renderer in parent.renderers) + { + KhaRenderer.framebuffer = framebuffer; + renderer.render(); + renderer.onRender.dispatch(); + + if (!renderer.onRender.canceled) + { + renderer.flip(); + } + } + + // parent.renderer.render (); + }); + #end + + return 0; + } + + private function mouseDown(button:Int, x:Int, y:Int):Void + { + var window = parent.__windowByID.get(-1); + + if (window != null) + { + window.onMouseDown.dispatch(x, y, button); + } + } + + private function mouseUp(button:Int, x:Int, y:Int):Void + { + var window = parent.__windowByID.get(-1); + + if (window != null) + { + window.onMouseUp.dispatch(x, y, button); + } + } + + private function mouseMove(x:Int, y:Int, mx:Int, my:Int):Void + { + var window = parent.__windowByID.get(-1); + + if (window != null) + { + window.onMouseMove.dispatch(x, y); + window.onMouseMoveRelative.dispatch(mx, my); + } + } + + private function mouseWheel(amount:Int):Void + { + var window = parent.__windowByID.get(-1); + + if (window != null) + { + window.onMouseWheel.dispatch(0, amount); + } + } + + public function exit():Void {} + + public function getFrameRate():Float + { + return frameRate; + } + + private function handleApplicationEvent():Void {} + + private function handleClipboardEvent():Void {} + + private function handleDropEvent():Void {} + + private function handleGamepadEvent():Void {} + + private function handleJoystickEvent():Void {} + + private function handleKeyEvent():Void {} + + private function handleMouseEvent():Void {} + + private function handleRenderEvent():Void {} + + private function handleSensorEvent():Void {} + + private function handleTextEvent():Void {} + + private function handleTouchEvent():Void {} + + private function handleWindowEvent():Void {} + + public function setFrameRate(value:Float):Float + { + return frameRate = value; + } + + private function updateTimer():Void {} +} + +private class ApplicationEventInfo +{ + public var deltaTime:Int; + public var type:ApplicationEventType; + + public function new(type:ApplicationEventType = null, deltaTime:Int = 0) + { + this.type = type; + this.deltaTime = deltaTime; + } + + public function clone():ApplicationEventInfo + { + return new ApplicationEventInfo(type, deltaTime); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ApplicationEventType(Int) +{ + var UPDATE = 0; + var EXIT = 1; +} + +private class ClipboardEventInfo +{ + public var type:ClipboardEventType; + + public function new(type:ClipboardEventType = null) + { + this.type = type; + } + + public function clone():ClipboardEventInfo + { + return new ClipboardEventInfo(type); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ClipboardEventType(Int) +{ + var UPDATE = 0; +} + +private class DropEventInfo +{ + #if hl + public var file:hl.Bytes; + #else + public var file:String; + #end + public var type:DropEventType; + + public function new(type:DropEventType = null, file:String = null) + { + this.type = type; + this.file = file; + } + + public function clone():DropEventInfo + { + return new DropEventInfo(type, file); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract DropEventType(Int) +{ + var DROP_FILE = 0; +} + +private class GamepadEventInfo +{ + public var axis:Int; + public var button:Int; + public var id:Int; + public var type:GamepadEventType; + public var value:Float; + + public function new(type:GamepadEventType = null, id:Int = 0, button:Int = 0, axis:Int = 0, value:Float = 0) + { + this.type = type; + this.id = id; + this.button = button; + this.axis = axis; + this.value = value; + } + + public function clone():GamepadEventInfo + { + return new GamepadEventInfo(type, id, button, axis, value); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract GamepadEventType(Int) +{ + var AXIS_MOVE = 0; + var BUTTON_DOWN = 1; + var BUTTON_UP = 2; + var CONNECT = 3; + var DISCONNECT = 4; +} + +private class JoystickEventInfo +{ + public var id:Int; + public var index:Int; + public var type:JoystickEventType; + public var value:Int; + public var x:Float; + public var y:Float; + + public function new(type:JoystickEventType = null, id:Int = 0, index:Int = 0, value:Int = 0, x:Float = 0, y:Float = 0) + { + this.type = type; + this.id = id; + this.index = index; + this.value = value; + this.x = x; + this.y = y; + } + + public function clone():JoystickEventInfo + { + return new JoystickEventInfo(type, id, index, value, x, y); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract JoystickEventType(Int) +{ + var AXIS_MOVE = 0; + var HAT_MOVE = 1; + var TRACKBALL_MOVE = 2; + var BUTTON_DOWN = 3; + var BUTTON_UP = 4; + var CONNECT = 5; + var DISCONNECT = 6; +} + +private class KeyEventInfo +{ + public var keyCode:Int; + public var modifier:Int; + public var type:KeyEventType; + public var windowID:Int; + + public function new(type:KeyEventType = null, windowID:Int = 0, keyCode:Int = 0, modifier:Int = 0) + { + this.type = type; + this.windowID = windowID; + this.keyCode = keyCode; + this.modifier = modifier; + } + + public function clone():KeyEventInfo + { + return new KeyEventInfo(type, windowID, keyCode, modifier); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract KeyEventType(Int) +{ + var KEY_DOWN = 0; + var KEY_UP = 1; +} + +private class MouseEventInfo +{ + public var button:Int; + public var movementX:Float; + public var movementY:Float; + public var type:MouseEventType; + public var windowID:Int; + public var x:Float; + public var y:Float; + + public function new(type:MouseEventType = null, windowID:Int = 0, x:Float = 0, y:Float = 0, button:Int = 0, movementX:Float = 0, movementY:Float = 0) + { + this.type = type; + this.windowID = 0; + this.x = x; + this.y = y; + this.button = button; + this.movementX = movementX; + this.movementY = movementY; + } + + public function clone():MouseEventInfo + { + return new MouseEventInfo(type, windowID, x, y, button, movementX, movementY); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract MouseEventType(Int) +{ + var MOUSE_DOWN = 0; + var MOUSE_UP = 1; + var MOUSE_MOVE = 2; + var MOUSE_WHEEL = 3; +} + +private class RenderEventInfo +{ + public var context:RenderContext; + public var type:RenderEventType; + + public function new(type:RenderEventType = null, context:RenderContext = null) + { + this.type = type; + this.context = context; + } + + public function clone():RenderEventInfo + { + return new RenderEventInfo(type, context); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract RenderEventType(Int) +{ + var RENDER = 0; + var RENDER_CONTEXT_LOST = 1; + var RENDER_CONTEXT_RESTORED = 2; +} + +private class SensorEventInfo +{ + public var id:Int; + public var x:Float; + public var y:Float; + public var z:Float; + public var type:SensorEventType; + + public function new(type:SensorEventType = null, id:Int = 0, x:Float = 0, y:Float = 0, z:Float = 0) + { + this.type = type; + this.id = id; + this.x = x; + this.y = y; + this.z = z; + } + + public function clone():SensorEventInfo + { + return new SensorEventInfo(type, id, x, y, z); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract SensorEventType(Int) +{ + var ACCELEROMETER = 0; +} + +private class TextEventInfo +{ + public var id:Int; + public var length:Int; + public var start:Int; + #if hl + public var text:hl.Bytes; + #else + public var text:String; + #end + public var type:TextEventType; + public var windowID:Int; + + public function new(type:TextEventType = null, windowID:Int = 0, text:String = "", start:Int = 0, length:Int = 0) + { + this.type = type; + this.windowID = windowID; + this.text = text; + this.start = start; + this.length = length; + } + + public function clone():TextEventInfo + { + return new TextEventInfo(type, windowID, text, start, length); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract TextEventType(Int) +{ + var TEXT_INPUT = 0; + var TEXT_EDIT = 1; +} + +private class TouchEventInfo +{ + public var device:Int; + public var dx:Float; + public var dy:Float; + public var id:Int; + public var pressure:Float; + public var type:TouchEventType; + public var x:Float; + public var y:Float; + + public function new(type:TouchEventType = null, x:Float = 0, y:Float = 0, id:Int = 0, dx:Float = 0, dy:Float = 0, pressure:Float = 0, device:Int = 0) + { + this.type = type; + this.x = x; + this.y = y; + this.id = id; + this.dx = dx; + this.dy = dy; + this.pressure = pressure; + this.device = device; + } + + public function clone():TouchEventInfo + { + return new TouchEventInfo(type, x, y, id, dx, dy, pressure, device); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract TouchEventType(Int) +{ + var TOUCH_START = 0; + var TOUCH_END = 1; + var TOUCH_MOVE = 2; +} + +private class WindowEventInfo +{ + public var height:Int; + public var type:WindowEventType; + public var width:Int; + public var windowID:Int; + public var x:Int; + public var y:Int; + + public function new(type:WindowEventType = null, windowID:Int = 0, width:Int = 0, height:Int = 0, x:Int = 0, y:Int = 0) + { + this.type = type; + this.windowID = windowID; + this.width = width; + this.height = height; + this.x = x; + this.y = y; + } + + public function clone():WindowEventInfo + { + return new WindowEventInfo(type, windowID, width, height, x, y); + } +} + +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract WindowEventType(Int) +{ + var WINDOW_ACTIVATE = 0; + var WINDOW_CLOSE = 1; + var WINDOW_DEACTIVATE = 2; + var WINDOW_ENTER = 3; + var WINDOW_FOCUS_IN = 4; + var WINDOW_FOCUS_OUT = 5; + var WINDOW_LEAVE = 6; + var WINDOW_MINIMIZE = 7; + var WINDOW_MOVE = 8; + var WINDOW_RESIZE = 9; + var WINDOW_RESTORE = 10; +} diff --git a/src/lime/_internal/backend/native/NativeApplication.hx b/src/lime/_internal/backend/native/NativeApplication.hx index c27e5d47b..52d4e9394 100644 --- a/src/lime/_internal/backend/native/NativeApplication.hx +++ b/src/lime/_internal/backend/native/NativeApplication.hx @@ -637,7 +637,7 @@ class NativeApplication } } -@:enum private abstract ApplicationEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ApplicationEventType(Int) { var UPDATE = 0; var EXIT = 1; @@ -658,7 +658,7 @@ class NativeApplication } } -@:enum private abstract ClipboardEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ClipboardEventType(Int) { var UPDATE = 0; } @@ -680,7 +680,7 @@ class NativeApplication } } -@:enum private abstract DropEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract DropEventType(Int) { var DROP_FILE = 0; } @@ -708,7 +708,7 @@ class NativeApplication } } -@:enum private abstract GamepadEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract GamepadEventType(Int) { var AXIS_MOVE = 0; var BUTTON_DOWN = 1; @@ -742,7 +742,7 @@ class NativeApplication } } -@:enum private abstract JoystickEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract JoystickEventType(Int) { var AXIS_MOVE = 0; var HAT_MOVE = 1; @@ -774,7 +774,7 @@ class NativeApplication } } -@:enum private abstract KeyEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract KeyEventType(Int) { var KEY_DOWN = 0; var KEY_UP = 1; @@ -809,7 +809,7 @@ class NativeApplication } } -@:enum private abstract MouseEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract MouseEventType(Int) { var MOUSE_DOWN = 0; var MOUSE_UP = 1; @@ -832,7 +832,7 @@ class NativeApplication } } -@:enum private abstract RenderEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract RenderEventType(Int) { var RENDER = 0; var RENDER_CONTEXT_LOST = 1; @@ -862,7 +862,7 @@ class NativeApplication } } -@:enum private abstract SensorEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract SensorEventType(Int) { var ACCELEROMETER = 0; } @@ -891,7 +891,7 @@ class NativeApplication } } -@:enum private abstract TextEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract TextEventType(Int) { var TEXT_INPUT = 0; var TEXT_EDIT = 1; @@ -926,7 +926,7 @@ class NativeApplication } } -@:enum private abstract TouchEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract TouchEventType(Int) { var TOUCH_START = 0; var TOUCH_END = 1; @@ -958,7 +958,7 @@ class NativeApplication } } -@:enum private abstract WindowEventType(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract WindowEventType(Int) { var WINDOW_ACTIVATE = 0; var WINDOW_CLOSE = 1; diff --git a/src/lime/_internal/backend/native/NativeWindow.hx b/src/lime/_internal/backend/native/NativeWindow.hx index 36790c5f4..b7f900184 100644 --- a/src/lime/_internal/backend/native/NativeWindow.hx +++ b/src/lime/_internal/backend/native/NativeWindow.hx @@ -719,7 +719,7 @@ class NativeWindow } } -@:enum private abstract MouseCursorType(Int) from Int to Int +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract MouseCursorType(Int) from Int to Int { var HIDDEN = 0; var ARROW = 1; @@ -736,7 +736,7 @@ class NativeWindow var WAIT_ARROW = 12; } -@:enum private abstract WindowFlags(Int) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract WindowFlags(Int) { var WINDOW_FLAG_FULLSCREEN = 0x00000001; var WINDOW_FLAG_BORDERLESS = 0x00000002; diff --git a/src/lime/_internal/graphics/ImageDataUtil.hx b/src/lime/_internal/graphics/ImageDataUtil.hx index c9885bec0..1d2b3c312 100644 --- a/src/lime/_internal/graphics/ImageDataUtil.hx +++ b/src/lime/_internal/graphics/ImageDataUtil.hx @@ -1748,7 +1748,8 @@ private class ImageDataView } } -@:noCompletion @:dox(hide) @:enum private abstract ThresholdOperation(Int) from Int to Int +@:noCompletion @:dox(hide) +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract ThresholdOperation(Int) from Int to Int { var NOT_EQUALS = 0; var EQUALS = 1; diff --git a/src/lime/graphics/PixelFormat.hx b/src/lime/graphics/PixelFormat.hx index 630c481c7..549256898 100644 --- a/src/lime/graphics/PixelFormat.hx +++ b/src/lime/graphics/PixelFormat.hx @@ -3,7 +3,7 @@ package lime.graphics; /** An enum containing different pixel encoding formats for image data **/ -@:enum abstract PixelFormat(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract PixelFormat(Int) from Int to Int from UInt to UInt { /** An image encoded in 32-bit RGBA color order diff --git a/src/lime/graphics/RenderContextType.hx b/src/lime/graphics/RenderContextType.hx index 119b39583..8dddd1aa4 100644 --- a/src/lime/graphics/RenderContextType.hx +++ b/src/lime/graphics/RenderContextType.hx @@ -3,7 +3,7 @@ package lime.graphics; /** An enum for possible render context types **/ -@:enum abstract RenderContextType(String) from String to String +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract RenderContextType(String) from String to String { /** Describes a Cairo render context diff --git a/src/lime/graphics/cairo/CairoAntialias.hx b/src/lime/graphics/cairo/CairoAntialias.hx index f266aca12..e3fc5f11f 100644 --- a/src/lime/graphics/cairo/CairoAntialias.hx +++ b/src/lime/graphics/cairo/CairoAntialias.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoAntialias(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoAntialias(Int) from Int to Int from UInt to UInt { public var DEFAULT = 0; public var NONE = 1; diff --git a/src/lime/graphics/cairo/CairoContent.hx b/src/lime/graphics/cairo/CairoContent.hx index 3fe849805..d57ac8e5e 100644 --- a/src/lime/graphics/cairo/CairoContent.hx +++ b/src/lime/graphics/cairo/CairoContent.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoContent(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoContent(Int) from Int to Int from UInt to UInt { public var COLOR = 0x1000; public var ALPHA = 0x2000; diff --git a/src/lime/graphics/cairo/CairoExtend.hx b/src/lime/graphics/cairo/CairoExtend.hx index 30b65a459..1ed95035f 100644 --- a/src/lime/graphics/cairo/CairoExtend.hx +++ b/src/lime/graphics/cairo/CairoExtend.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoExtend(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoExtend(Int) from Int to Int from UInt to UInt { public var NONE = 0; public var REPEAT = 1; diff --git a/src/lime/graphics/cairo/CairoFillRule.hx b/src/lime/graphics/cairo/CairoFillRule.hx index 80d1f66da..6fc658079 100644 --- a/src/lime/graphics/cairo/CairoFillRule.hx +++ b/src/lime/graphics/cairo/CairoFillRule.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoFillRule(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoFillRule(Int) from Int to Int from UInt to UInt { public var WINDING = 0; public var EVEN_ODD = 1; diff --git a/src/lime/graphics/cairo/CairoFilter.hx b/src/lime/graphics/cairo/CairoFilter.hx index 968ae849c..305f393f0 100644 --- a/src/lime/graphics/cairo/CairoFilter.hx +++ b/src/lime/graphics/cairo/CairoFilter.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoFilter(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoFilter(Int) from Int to Int from UInt to UInt { public var FAST = 0; public var GOOD = 1; diff --git a/src/lime/graphics/cairo/CairoFormat.hx b/src/lime/graphics/cairo/CairoFormat.hx index 1d9248daa..38b8d66f5 100644 --- a/src/lime/graphics/cairo/CairoFormat.hx +++ b/src/lime/graphics/cairo/CairoFormat.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoFormat(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoFormat(Int) from Int to Int from UInt to UInt { public var INVALID = -1; public var ARGB32 = 0; diff --git a/src/lime/graphics/cairo/CairoHintMetrics.hx b/src/lime/graphics/cairo/CairoHintMetrics.hx index b0e800c40..cd145d25c 100644 --- a/src/lime/graphics/cairo/CairoHintMetrics.hx +++ b/src/lime/graphics/cairo/CairoHintMetrics.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoHintMetrics(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoHintMetrics(Int) from Int to Int from UInt to UInt { public var DEFAULT = 0; public var OFF = 1; diff --git a/src/lime/graphics/cairo/CairoHintStyle.hx b/src/lime/graphics/cairo/CairoHintStyle.hx index a21e5a31b..e78cdb0af 100644 --- a/src/lime/graphics/cairo/CairoHintStyle.hx +++ b/src/lime/graphics/cairo/CairoHintStyle.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoHintStyle(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoHintStyle(Int) from Int to Int from UInt to UInt { public var DEFAULT = 0; public var NONE = 1; diff --git a/src/lime/graphics/cairo/CairoLineCap.hx b/src/lime/graphics/cairo/CairoLineCap.hx index ef0de8ce3..d7eaea90b 100644 --- a/src/lime/graphics/cairo/CairoLineCap.hx +++ b/src/lime/graphics/cairo/CairoLineCap.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoLineCap(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoLineCap(Int) from Int to Int from UInt to UInt { public var BUTT = 0; public var ROUND = 1; diff --git a/src/lime/graphics/cairo/CairoLineJoin.hx b/src/lime/graphics/cairo/CairoLineJoin.hx index 2bd994252..a3567b3f9 100644 --- a/src/lime/graphics/cairo/CairoLineJoin.hx +++ b/src/lime/graphics/cairo/CairoLineJoin.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoLineJoin(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoLineJoin(Int) from Int to Int from UInt to UInt { public var MITER = 0; public var ROUND = 1; diff --git a/src/lime/graphics/cairo/CairoOperator.hx b/src/lime/graphics/cairo/CairoOperator.hx index ed48fba3a..bf8919226 100644 --- a/src/lime/graphics/cairo/CairoOperator.hx +++ b/src/lime/graphics/cairo/CairoOperator.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoOperator(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoOperator(Int) from Int to Int from UInt to UInt { public var CLEAR = 0; public var SOURCE = 1; diff --git a/src/lime/graphics/cairo/CairoStatus.hx b/src/lime/graphics/cairo/CairoStatus.hx index aba825b3c..669a24329 100644 --- a/src/lime/graphics/cairo/CairoStatus.hx +++ b/src/lime/graphics/cairo/CairoStatus.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoStatus(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoStatus(Int) from Int to Int from UInt to UInt { public var SUCCESS = 0; public var NO_MEMORY = 1; diff --git a/src/lime/graphics/cairo/CairoSubpixelOrder.hx b/src/lime/graphics/cairo/CairoSubpixelOrder.hx index ce8ada409..7c8051c27 100644 --- a/src/lime/graphics/cairo/CairoSubpixelOrder.hx +++ b/src/lime/graphics/cairo/CairoSubpixelOrder.hx @@ -1,7 +1,7 @@ package lime.graphics.cairo; #if (!lime_doc_gen || lime_cairo) -@:enum abstract CairoSubpixelOrder(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CairoSubpixelOrder(Int) from Int to Int from UInt to UInt { public var DEFAULT = 0; public var RGB = 1; diff --git a/src/lime/graphics/opengl/GL.hx b/src/lime/graphics/opengl/GL.hx index 6c8af0403..57df0cb01 100644 --- a/src/lime/graphics/opengl/GL.hx +++ b/src/lime/graphics/opengl/GL.hx @@ -2635,7 +2635,7 @@ class GL } } -@:dox(hide) @:noCompletion @:enum abstract GLObjectType(Int) to Int +@:dox(hide) @:noCompletion #if (haxe_ver >= 4.0) enum #else @:enum #end abstract GLObjectType(Int) to Int { var UNKNOWN = 0; var PROGRAM = 1; diff --git a/src/lime/media/AudioContextType.hx b/src/lime/media/AudioContextType.hx index 84af8c76c..f192890e5 100644 --- a/src/lime/media/AudioContextType.hx +++ b/src/lime/media/AudioContextType.hx @@ -1,6 +1,6 @@ package lime.media; -@:enum abstract AudioContextType(String) from String to String +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract AudioContextType(String) from String to String { var FLASH = "flash"; var HTML5 = "html5"; diff --git a/src/lime/net/HTTPRequestMethod.hx b/src/lime/net/HTTPRequestMethod.hx index b98c30e56..e5226cefa 100644 --- a/src/lime/net/HTTPRequestMethod.hx +++ b/src/lime/net/HTTPRequestMethod.hx @@ -1,6 +1,6 @@ package lime.net; -@:enum abstract HTTPRequestMethod(String) from String to String +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract HTTPRequestMethod(String) from String to String { public var DELETE = "DELETE"; public var GET = "GET"; diff --git a/src/lime/net/curl/CURLCode.hx b/src/lime/net/curl/CURLCode.hx index 80e198696..7119de3b6 100644 --- a/src/lime/net/curl/CURLCode.hx +++ b/src/lime/net/curl/CURLCode.hx @@ -1,7 +1,7 @@ package lime.net.curl; #if (!lime_doc_gen || lime_curl) -@:enum abstract CURLCode(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CURLCode(Int) from Int to Int from UInt to UInt { var OK = 0; var UNSUPPORTED_PROTOCOL = 1; diff --git a/src/lime/net/curl/CURLInfo.hx b/src/lime/net/curl/CURLInfo.hx index fe2ecfbd7..d1fc6fe1a 100644 --- a/src/lime/net/curl/CURLInfo.hx +++ b/src/lime/net/curl/CURLInfo.hx @@ -1,7 +1,7 @@ package lime.net.curl; #if (!lime_doc_gen || lime_curl) -@:enum abstract CURLInfo(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CURLInfo(Int) from Int to Int from UInt to UInt { var NONE = 0; var EFFECTIVE_URL = 0x100000 + 1; diff --git a/src/lime/net/curl/CURLMultiCode.hx b/src/lime/net/curl/CURLMultiCode.hx index 9b26c8d8d..a787651c1 100644 --- a/src/lime/net/curl/CURLMultiCode.hx +++ b/src/lime/net/curl/CURLMultiCode.hx @@ -1,7 +1,7 @@ package lime.net.curl; #if (!lime_doc_gen || lime_curl) -@:enum abstract CURLMultiCode(Int) from Int to Int from UInt /*to UInt*/ +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CURLMultiCode(Int) from Int to Int from UInt /*to UInt*/ { /* please call curl_multi_perform() or curl_multi_socket*() soon */ var CALL_MULTI_PERFORM = -1; diff --git a/src/lime/net/curl/CURLMultiOption.hx b/src/lime/net/curl/CURLMultiOption.hx index 28b892814..128e61ad1 100644 --- a/src/lime/net/curl/CURLMultiOption.hx +++ b/src/lime/net/curl/CURLMultiOption.hx @@ -1,7 +1,7 @@ package lime.net.curl; #if (!lime_doc_gen || lime_curl) -@:enum abstract CURLMultiOption(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CURLMultiOption(Int) from Int to Int from UInt to UInt { /* This is the socket callback function pointer */ var SOCKETFUNCTION = 200001; diff --git a/src/lime/net/curl/CURLOption.hx b/src/lime/net/curl/CURLOption.hx index 7619f92ce..e7dac5748 100644 --- a/src/lime/net/curl/CURLOption.hx +++ b/src/lime/net/curl/CURLOption.hx @@ -1,7 +1,7 @@ package lime.net.curl; #if (!lime_doc_gen || lime_curl) -@:enum abstract CURLOption(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CURLOption(Int) from Int to Int from UInt to UInt { // var FILE = 10001; // var WRITEDATA = 10001; diff --git a/src/lime/net/curl/CURLVersion.hx b/src/lime/net/curl/CURLVersion.hx index e08e19048..34aa48063 100644 --- a/src/lime/net/curl/CURLVersion.hx +++ b/src/lime/net/curl/CURLVersion.hx @@ -1,7 +1,7 @@ package lime.net.curl; #if (!lime_doc_gen || lime_curl) -@:enum abstract CURLVersion(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract CURLVersion(Int) from Int to Int from UInt to UInt { var FIRST = 0; var SECOND = 1; diff --git a/src/lime/net/oauth/OAuthSignatureMethod.hx b/src/lime/net/oauth/OAuthSignatureMethod.hx index df29fa0b1..4a163ab18 100644 --- a/src/lime/net/oauth/OAuthSignatureMethod.hx +++ b/src/lime/net/oauth/OAuthSignatureMethod.hx @@ -1,6 +1,6 @@ package lime.net.oauth; -@:enum abstract OAuthSignatureMethod(String) +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract OAuthSignatureMethod(String) { // var PLAINTEXT = "PLAINTEXT"; var HMAC_SHA1 = "HMAC-SHA1"; diff --git a/src/lime/net/oauth/OAuthVersion.hx b/src/lime/net/oauth/OAuthVersion.hx index d3026fb46..02314f05e 100644 --- a/src/lime/net/oauth/OAuthVersion.hx +++ b/src/lime/net/oauth/OAuthVersion.hx @@ -1,6 +1,6 @@ package lime.net.oauth; -@:enum abstract OAuthVersion(String) +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract OAuthVersion(String) { var V1 = "1.0"; var V2 = "2.0"; diff --git a/src/lime/system/System.hx b/src/lime/system/System.hx index 6701340b1..005061521 100644 --- a/src/lime/system/System.hx +++ b/src/lime/system/System.hx @@ -818,7 +818,7 @@ class System } } -@:enum private abstract SystemDirectory(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) private enum #else @:enum private #end abstract SystemDirectory(Int) from Int to Int from UInt to UInt { var APPLICATION = 0; var APPLICATION_STORAGE = 1; diff --git a/src/lime/text/harfbuzz/HBBufferClusterLevel.hx b/src/lime/text/harfbuzz/HBBufferClusterLevel.hx index e8c44c402..4030093ba 100644 --- a/src/lime/text/harfbuzz/HBBufferClusterLevel.hx +++ b/src/lime/text/harfbuzz/HBBufferClusterLevel.hx @@ -1,7 +1,7 @@ package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) -@:enum abstract HBBufferClusterLevel(Int) from Int to Int +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract HBBufferClusterLevel(Int) from Int to Int { public var MONOTONE_GRAPHEMES = 0; public var MONOTONE_CHARACTERS = 1; diff --git a/src/lime/text/harfbuzz/HBBufferContentType.hx b/src/lime/text/harfbuzz/HBBufferContentType.hx index 13de4fcc0..09d96650b 100644 --- a/src/lime/text/harfbuzz/HBBufferContentType.hx +++ b/src/lime/text/harfbuzz/HBBufferContentType.hx @@ -1,7 +1,7 @@ package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) -@:enum abstract HBBufferContentType(Int) from Int to Int +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract HBBufferContentType(Int) from Int to Int { public var INVALID = 0; public var UNICODE = 1; diff --git a/src/lime/text/harfbuzz/HBBufferFlags.hx b/src/lime/text/harfbuzz/HBBufferFlags.hx index 696c130b1..9e560cb5c 100644 --- a/src/lime/text/harfbuzz/HBBufferFlags.hx +++ b/src/lime/text/harfbuzz/HBBufferFlags.hx @@ -1,7 +1,7 @@ package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) -@:enum abstract HBBufferFlags(Int) from Int to Int +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract HBBufferFlags(Int) from Int to Int { public var DEFAULT = 0x00000000; public var BOT = 0x00000001; diff --git a/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx b/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx index 6d71b66f5..519879924 100644 --- a/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx +++ b/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx @@ -1,7 +1,7 @@ package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) -@:enum abstract HBBufferSerializeFlags(Int) from Int to Int +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract HBBufferSerializeFlags(Int) from Int to Int { public var DEFAULT = 0x00000000; public var NO_CLUSTERS = 0x00000001; diff --git a/src/lime/text/harfbuzz/HBBufferSerializeFormat.hx b/src/lime/text/harfbuzz/HBBufferSerializeFormat.hx index 3082056b8..92f60090e 100644 --- a/src/lime/text/harfbuzz/HBBufferSerializeFormat.hx +++ b/src/lime/text/harfbuzz/HBBufferSerializeFormat.hx @@ -1,7 +1,7 @@ package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) -@:enum abstract HBBufferSerializeFormat(Int) from Int to Int +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract HBBufferSerializeFormat(Int) from Int to Int { // public var HB_BUFFER_SERIALIZE_FORMAT_TEXT = HB_TAG('T', 'E', 'X', 'T'); // public var JSON = HB_TAG('J', 'S', 'O', 'N'); diff --git a/src/lime/text/harfbuzz/HBDirection.hx b/src/lime/text/harfbuzz/HBDirection.hx index 47b4f4ea3..dd081850b 100644 --- a/src/lime/text/harfbuzz/HBDirection.hx +++ b/src/lime/text/harfbuzz/HBDirection.hx @@ -1,7 +1,7 @@ package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) -@:enum abstract HBDirection(Int) from Int to Int +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract HBDirection(Int) from Int to Int { public var INVALID = 0; public var LTR = 4; diff --git a/src/lime/text/harfbuzz/HBMemoryMode.hx b/src/lime/text/harfbuzz/HBMemoryMode.hx index 1b7ee85df..30a9cda91 100644 --- a/src/lime/text/harfbuzz/HBMemoryMode.hx +++ b/src/lime/text/harfbuzz/HBMemoryMode.hx @@ -1,7 +1,7 @@ package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) -@:enum abstract HBMemoryMode(Int) from Int to Int +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract HBMemoryMode(Int) from Int to Int { public var DUPLICATE = 0; public var READONLY = 1; diff --git a/src/lime/text/harfbuzz/HBScript.hx b/src/lime/text/harfbuzz/HBScript.hx index f01c1eb72..bc3359dd5 100644 --- a/src/lime/text/harfbuzz/HBScript.hx +++ b/src/lime/text/harfbuzz/HBScript.hx @@ -1,7 +1,7 @@ package lime.text.harfbuzz; #if (!lime_doc_gen || lime_harfbuzz) -@:enum abstract HBScript(Int) from Int to Int +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract HBScript(Int) from Int to Int { public var COMMON = "Z".code << 24 | "y".code << 16 | "y".code << 8 | "y".code; public var INHERITED = "Z".code << 24 | "i".code << 16 | "n".code << 8 | "h".code; diff --git a/src/lime/tools/Platform.hx b/src/lime/tools/Platform.hx index 8036db22f..899ea7636 100644 --- a/src/lime/tools/Platform.hx +++ b/src/lime/tools/Platform.hx @@ -1,6 +1,6 @@ package lime.tools; -@:enum abstract Platform(String) +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract Platform(String) { var AIR = "air"; var ANDROID = "android"; diff --git a/src/lime/tools/ProjectXMLParser.hx b/src/lime/tools/ProjectXMLParser.hx index 7313183f2..6f6bc7dc1 100644 --- a/src/lime/tools/ProjectXMLParser.hx +++ b/src/lime/tools/ProjectXMLParser.hx @@ -714,7 +714,7 @@ class ProjectXMLParser extends HXProject for (file in files) { - if (FileSystem.isDirectory(path + "/" + file)) + if (FileSystem.exists(path + "/" + file) && FileSystem.isDirectory(path + "/" + file)) { if (Path.extension(file) == "bundle") { diff --git a/src/lime/ui/FileDialog.hx b/src/lime/ui/FileDialog.hx index d1ac15372..62c7c1c00 100644 --- a/src/lime/ui/FileDialog.hx +++ b/src/lime/ui/FileDialog.hx @@ -110,6 +110,7 @@ class FileDialog #end var path = null; + #if (!macro && lime_cffi) #if hl var bytes = NativeCFFI.lime_file_dialog_open_file(title, filter, defaultPath); if (bytes != null) @@ -119,6 +120,7 @@ class FileDialog #else path = NativeCFFI.lime_file_dialog_open_file(title, filter, defaultPath); #end + #end worker.sendComplete(path); @@ -128,6 +130,7 @@ class FileDialog #end var paths = null; + #if (!macro && lime_cffi) #if hl var bytes:NativeArray = cast NativeCFFI.lime_file_dialog_open_files(title, filter, defaultPath); if (bytes != null) @@ -141,6 +144,7 @@ class FileDialog #else paths = NativeCFFI.lime_file_dialog_open_files(title, filter, defaultPath); #end + #end worker.sendComplete(paths); @@ -150,6 +154,7 @@ class FileDialog #end var path = null; + #if (!macro && lime_cffi) #if hl var bytes = NativeCFFI.lime_file_dialog_open_directory(title, filter, defaultPath); if (bytes != null) @@ -159,6 +164,7 @@ class FileDialog #else path = NativeCFFI.lime_file_dialog_open_directory(title, filter, defaultPath); #end + #end worker.sendComplete(path); @@ -168,6 +174,7 @@ class FileDialog #end var path = null; + #if (!macro && lime_cffi) #if hl var bytes = NativeCFFI.lime_file_dialog_save_file(title, filter, defaultPath); if (bytes != null) @@ -177,6 +184,7 @@ class FileDialog #else path = NativeCFFI.lime_file_dialog_save_file(title, filter, defaultPath); #end + #end worker.sendComplete(path); } @@ -250,12 +258,14 @@ class FileDialog #end var path = null; + #if (!macro && lime_cffi) #if hl var bytes = NativeCFFI.lime_file_dialog_open_file(title, filter, defaultPath); if (bytes != null) path = @:privateAccess String.fromUTF8(cast bytes); #else path = NativeCFFI.lime_file_dialog_open_file(title, filter, defaultPath); #end + #end worker.sendComplete(path); }); @@ -318,12 +328,14 @@ class FileDialog #end var path = null; + #if (!macro && lime_cffi) #if hl var bytes = NativeCFFI.lime_file_dialog_save_file(title, filter, defaultPath); path = @:privateAccess String.fromUTF8(cast bytes); #else path = NativeCFFI.lime_file_dialog_save_file(title, filter, defaultPath); #end + #end worker.sendComplete(path); }); diff --git a/src/lime/ui/GamepadAxis.hx b/src/lime/ui/GamepadAxis.hx index 25dc60409..e328d1ceb 100644 --- a/src/lime/ui/GamepadAxis.hx +++ b/src/lime/ui/GamepadAxis.hx @@ -1,6 +1,6 @@ package lime.ui; -@:enum abstract GamepadAxis(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract GamepadAxis(Int) from Int to Int from UInt to UInt { var LEFT_X = 0; var LEFT_Y = 1; diff --git a/src/lime/ui/GamepadButton.hx b/src/lime/ui/GamepadButton.hx index 75d9b4734..33573fcd1 100644 --- a/src/lime/ui/GamepadButton.hx +++ b/src/lime/ui/GamepadButton.hx @@ -1,6 +1,6 @@ package lime.ui; -@:enum abstract GamepadButton(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract GamepadButton(Int) from Int to Int from UInt to UInt { var A = 0; var B = 1; diff --git a/src/lime/ui/KeyCode.hx b/src/lime/ui/KeyCode.hx index 9e0ccda13..1843e6d4f 100644 --- a/src/lime/ui/KeyCode.hx +++ b/src/lime/ui/KeyCode.hx @@ -3,7 +3,7 @@ package lime.ui; import lime._internal.backend.native.NativeCFFI; @:access(lime._internal.backend.native.NativeCFFI) -@:enum abstract KeyCode(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract KeyCode(Int) from Int to Int from UInt to UInt { var UNKNOWN = 0x00; var BACKSPACE = 0x08; diff --git a/src/lime/ui/MouseButton.hx b/src/lime/ui/MouseButton.hx index c7901fc13..831d8c7d2 100644 --- a/src/lime/ui/MouseButton.hx +++ b/src/lime/ui/MouseButton.hx @@ -1,6 +1,6 @@ package lime.ui; -@:enum abstract MouseButton(Int) from Int to Int +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract MouseButton(Int) from Int to Int { var LEFT = 0; var MIDDLE = 1; diff --git a/src/lime/ui/ScanCode.hx b/src/lime/ui/ScanCode.hx index f85097c85..52cca0a5d 100644 --- a/src/lime/ui/ScanCode.hx +++ b/src/lime/ui/ScanCode.hx @@ -4,7 +4,7 @@ import lime._internal.backend.native.NativeCFFI; @:access(lime._internal.backend.native.NativeCFFI) @:access(lime.ui.KeyCode) -@:enum abstract ScanCode(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract ScanCode(Int) from Int to Int from UInt to UInt { var UNKNOWN = 0; var BACKSPACE = 42; diff --git a/src/lime/utils/ArrayBufferView.hx b/src/lime/utils/ArrayBufferView.hx index 746f70e15..23ece48ed 100644 --- a/src/lime/utils/ArrayBufferView.hx +++ b/src/lime/utils/ArrayBufferView.hx @@ -400,7 +400,7 @@ class ArrayBufferView RangeError; } -@:noCompletion @:dox(hide) @:enum +@:noCompletion @:dox(hide) #if (haxe_ver >= 4.0) enum #else @:enum #end abstract TypedArrayType(Int) from Int to Int { var None = 0; @@ -420,7 +420,7 @@ abstract TypedArrayType(Int) from Int to Int { // 8 #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getInt8(buffer:ArrayBuffer, byteOffset:Int):Int @@ -434,7 +434,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setInt8(buffer:ArrayBuffer, byteOffset:Int, value:Int) @@ -450,7 +450,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getUint8(buffer:ArrayBuffer, byteOffset:Int):Null @@ -463,7 +463,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setUint8Clamped(buffer:ArrayBuffer, byteOffset:Int, value:UInt) @@ -472,7 +472,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setUint8(buffer:ArrayBuffer, byteOffset:Int, value:UInt) @@ -547,7 +547,7 @@ abstract TypedArrayType(Int) from Int to Int } // setInt16_BE #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getUint16(buffer:ArrayBuffer, byteOffset:Int):Null @@ -563,7 +563,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getUint16_BE(buffer:ArrayBuffer, byteOffset:Int):Null @@ -579,7 +579,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setUint16(buffer:ArrayBuffer, byteOffset:Int, value:UInt) @@ -592,7 +592,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setUint16_BE(buffer:ArrayBuffer, byteOffset:Int, value:UInt) @@ -607,7 +607,7 @@ abstract TypedArrayType(Int) from Int to Int // 32 #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getInt32(buffer:ArrayBuffer, byteOffset:Int):Int @@ -620,7 +620,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getInt32_BE(buffer:ArrayBuffer, byteOffset:Int):Int @@ -633,7 +633,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setInt32(buffer:ArrayBuffer, byteOffset:Int, value:Int) @@ -650,7 +650,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setInt32_BE(buffer:ArrayBuffer, byteOffset:Int, value:Int) @@ -667,7 +667,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getUint32(buffer:ArrayBuffer, byteOffset:Int):Null @@ -680,7 +680,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getUint32_BE(buffer:ArrayBuffer, byteOffset:Int):Null @@ -693,7 +693,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setUint32(buffer:ArrayBuffer, byteOffset:Int, value:UInt) @@ -706,7 +706,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setUint32_BE(buffer:ArrayBuffer, byteOffset:Int, value:UInt) @@ -720,7 +720,7 @@ abstract TypedArrayType(Int) from Int to Int // Float #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getFloat32(buffer:ArrayBuffer, byteOffset:Int):Float @@ -733,7 +733,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getFloat32_BE(buffer:ArrayBuffer, byteOffset:Int):Float @@ -746,7 +746,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setFloat32(buffer:ArrayBuffer, byteOffset:Int, value:Float) @@ -762,7 +762,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setFloat32_BE(buffer:ArrayBuffer, byteOffset:Int, value:Float) @@ -778,7 +778,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getFloat64(buffer:ArrayBuffer, byteOffset:Int):Float @@ -791,7 +791,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function getFloat64_BE(buffer:ArrayBuffer, byteOffset:Int):Float @@ -804,7 +804,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setFloat64(buffer:ArrayBuffer, byteOffset:Int, value:Float) @@ -820,7 +820,7 @@ abstract TypedArrayType(Int) from Int to Int } #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end public static function setFloat64_BE(buffer:ArrayBuffer, byteOffset:Int, value:Float) @@ -837,7 +837,7 @@ abstract TypedArrayType(Int) from Int to Int // Internal #if !no_typedarray_inline - @:extern + #if (haxe_ver >= 4.0) extern #else @:extern #end inline #end // clamp a Int to a 0-255 Uint8 (for Uint8Clamped array) diff --git a/src/lime/utils/AssetType.hx b/src/lime/utils/AssetType.hx index d3649debd..6c713709d 100644 --- a/src/lime/utils/AssetType.hx +++ b/src/lime/utils/AssetType.hx @@ -1,6 +1,6 @@ package lime.utils; -@:enum abstract AssetType(String) to String +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract AssetType(String) to String { var BINARY = "BINARY"; var FONT = "FONT"; diff --git a/src/lime/utils/Float32Array.hx b/src/lime/utils/Float32Array.hx index bf3fe3e25..4a29c4552 100644 --- a/src/lime/utils/Float32Array.hx +++ b/src/lime/utils/Float32Array.hx @@ -62,10 +62,10 @@ abstract Float32Array(JSFloat32Array) from JSFloat32Array to JSFloat32Array } } - @:arrayAccess @:extern inline function __set(idx:Int, val:Float):Float + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __set(idx:Int, val:Float):Float return this[idx] = val; - @:arrayAccess @:extern inline function __get(idx:Int):Float + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __get(idx:Int):Float return this[idx]; // non spec haxe conversions @@ -150,18 +150,18 @@ abstract Float32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView inline function toString() return this != null ? 'Float32Array [byteLength:${this.byteLength}, length:${this.length}]' : null; - @:extern inline function get_length() + #if (haxe_ver >= 4.0) extern #else @:extern #end inline function get_length() return this.length; @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __get(idx:Int):Float { return ArrayBufferIO.getFloat32(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT)); } @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __set(idx:Int, val:Float):Float { ArrayBufferIO.setFloat32(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT), val); diff --git a/src/lime/utils/Float64Array.hx b/src/lime/utils/Float64Array.hx index 0db29a844..421206f21 100644 --- a/src/lime/utils/Float64Array.hx +++ b/src/lime/utils/Float64Array.hx @@ -61,10 +61,10 @@ abstract Float64Array(JSFloat64Array) from JSFloat64Array to JSFloat64Array } } - @:arrayAccess @:extern inline function __set(idx:Int, val:Float):Float + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __set(idx:Int, val:Float):Float return this[idx] = val; - @:arrayAccess @:extern inline function __get(idx:Int):Float + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __get(idx:Int):Float return this[idx]; // non spec haxe conversions @@ -148,14 +148,14 @@ abstract Float64Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView return this.length; @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __get(idx:Int):Float { return ArrayBufferIO.getFloat64(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT)); } @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __set(idx:Int, val:Float):Float { ArrayBufferIO.setFloat64(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT), val); diff --git a/src/lime/utils/Int16Array.hx b/src/lime/utils/Int16Array.hx index 3dc09461f..6d247067b 100644 --- a/src/lime/utils/Int16Array.hx +++ b/src/lime/utils/Int16Array.hx @@ -61,10 +61,10 @@ abstract Int16Array(JSInt16Array) from JSInt16Array to JSInt16Array } } - @:arrayAccess @:extern inline function __set(idx:Int, val:Int):Int + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __set(idx:Int, val:Int):Int return this[idx] = val; - @:arrayAccess @:extern inline function __get(idx:Int):Int + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __get(idx:Int):Int return this[idx]; // non spec haxe conversions @@ -148,14 +148,14 @@ abstract Int16Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView return this.length; @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __get(idx:Int) { return ArrayBufferIO.getInt16(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT)); } @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __set(idx:Int, val:Int) { ArrayBufferIO.setInt16(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT), val); diff --git a/src/lime/utils/Int32Array.hx b/src/lime/utils/Int32Array.hx index 3d780cfc8..8f3de2c00 100644 --- a/src/lime/utils/Int32Array.hx +++ b/src/lime/utils/Int32Array.hx @@ -61,10 +61,10 @@ abstract Int32Array(JSInt32Array) from JSInt32Array to JSInt32Array } } - @:arrayAccess @:extern inline function __set(idx:Int, val:Int):Int + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __set(idx:Int, val:Int):Int return this[idx] = val; - @:arrayAccess @:extern inline function __get(idx:Int):Int + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __get(idx:Int):Int return this[idx]; // non spec haxe conversions @@ -148,14 +148,14 @@ abstract Int32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView return this.length; @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __get(idx:Int) { return ArrayBufferIO.getInt32(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT)); } @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __set(idx:Int, val:Int) { ArrayBufferIO.setInt32(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT), val); diff --git a/src/lime/utils/Int8Array.hx b/src/lime/utils/Int8Array.hx index 80d8c5d22..50c211cba 100644 --- a/src/lime/utils/Int8Array.hx +++ b/src/lime/utils/Int8Array.hx @@ -61,10 +61,10 @@ abstract Int8Array(JSInt8Array) from JSInt8Array to JSInt8Array } } - @:arrayAccess @:extern inline function __set(idx:Int, val:Int):Int + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __set(idx:Int, val:Int):Int return this[idx] = val; - @:arrayAccess @:extern inline function __get(idx:Int):Int + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __get(idx:Int):Int return this[idx]; // non spec haxe conversions @@ -148,14 +148,14 @@ abstract Int8Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView return this.length; @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __get(idx:Int) { return ArrayBufferIO.getInt8(this.buffer, this.byteOffset + idx); } @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __set(idx:Int, val:Int) { ArrayBufferIO.setInt8(this.buffer, this.byteOffset + idx, val); diff --git a/src/lime/utils/LogLevel.hx b/src/lime/utils/LogLevel.hx index 8ebbff7a3..e0c813ec8 100644 --- a/src/lime/utils/LogLevel.hx +++ b/src/lime/utils/LogLevel.hx @@ -1,6 +1,6 @@ package lime.utils; -@:enum abstract LogLevel(Int) from Int to Int from UInt to UInt +#if (haxe_ver >= 4.0) enum #else @:enum #end abstract LogLevel(Int) from Int to Int from UInt to UInt { var NONE = 0; var ERROR = 1; diff --git a/src/lime/utils/UInt16Array.hx b/src/lime/utils/UInt16Array.hx index a29817dc2..de4c9c966 100644 --- a/src/lime/utils/UInt16Array.hx +++ b/src/lime/utils/UInt16Array.hx @@ -61,10 +61,10 @@ abstract UInt16Array(JSUInt16Array) from JSUInt16Array to JSUInt16Array } } - @:arrayAccess @:extern inline function __set(idx:Int, val:UInt):UInt + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __set(idx:Int, val:UInt):UInt return this[idx] = val; - @:arrayAccess @:extern inline function __get(idx:Int):UInt + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __get(idx:Int):UInt return this[idx]; // non spec haxe conversions @@ -148,14 +148,14 @@ abstract UInt16Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView return this.length; @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __get(idx:Int) { return ArrayBufferIO.getUint16(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT)); } @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __set(idx:Int, val:UInt) { ArrayBufferIO.setUint16(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT), val); diff --git a/src/lime/utils/UInt32Array.hx b/src/lime/utils/UInt32Array.hx index 60585167b..976cb2e2c 100644 --- a/src/lime/utils/UInt32Array.hx +++ b/src/lime/utils/UInt32Array.hx @@ -61,10 +61,10 @@ abstract UInt32Array(JSUInt32Array) from JSUInt32Array to JSUInt32Array } } - @:arrayAccess @:extern inline function __set(idx:Int, val:UInt):UInt + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __set(idx:Int, val:UInt):UInt return this[idx] = val; - @:arrayAccess @:extern inline function __get(idx:Int):UInt + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __get(idx:Int):UInt return this[idx]; // non spec haxe conversions @@ -148,14 +148,14 @@ abstract UInt32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView return this.length; @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __get(idx:Int) { return ArrayBufferIO.getUint32(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT)); } @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __set(idx:Int, val:UInt) { ArrayBufferIO.setUint32(this.buffer, this.byteOffset + (idx * BYTES_PER_ELEMENT), val); diff --git a/src/lime/utils/UInt8Array.hx b/src/lime/utils/UInt8Array.hx index 52d782f9d..b5d65b0f5 100644 --- a/src/lime/utils/UInt8Array.hx +++ b/src/lime/utils/UInt8Array.hx @@ -59,10 +59,10 @@ abstract UInt8Array(JSUInt8Array) from JSUInt8Array to JSUInt8Array } } - @:arrayAccess @:extern inline function __set(idx:Int, val:UInt):UInt + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __set(idx:Int, val:UInt):UInt return this[idx] = val; - @:arrayAccess @:extern inline function __get(idx:Int):UInt + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __get(idx:Int):UInt return this[idx]; // non spec haxe conversions @@ -149,14 +149,14 @@ abstract UInt8Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView return this.length; @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __get(idx:Int) { return ArrayBufferIO.getUint8(this.buffer, this.byteOffset + idx); } @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __set(idx:Int, val:UInt) { ArrayBufferIO.setUint8(this.buffer, this.byteOffset + idx, val); diff --git a/src/lime/utils/UInt8ClampedArray.hx b/src/lime/utils/UInt8ClampedArray.hx index b261af058..a2c642d66 100644 --- a/src/lime/utils/UInt8ClampedArray.hx +++ b/src/lime/utils/UInt8ClampedArray.hx @@ -61,10 +61,10 @@ abstract UInt8ClampedArray(JSUInt8ClampedArray) from JSUInt8ClampedArray to JSUI } } - @:arrayAccess @:extern inline function __set(idx:Int, val:UInt):UInt + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __set(idx:Int, val:UInt):UInt return this[idx] = _clamp(val); - @:arrayAccess @:extern inline function __get(idx:Int):UInt + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end inline function __get(idx:Int):UInt return this[idx]; // non spec haxe conversions @@ -158,14 +158,14 @@ abstract UInt8ClampedArray(ArrayBufferView) from ArrayBufferView to ArrayBufferV return this.length; @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __get(idx:Int) { return ArrayBufferIO.getUint8(this.buffer, this.byteOffset + idx); } @:noCompletion - @:arrayAccess @:extern + @:arrayAccess #if (haxe_ver >= 4.0) extern #else @:extern #end public inline function __set(idx:Int, val:UInt) { ArrayBufferIO.setUint8Clamped(this.buffer, this.byteOffset + idx, val);