kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 8.3.0-Dev

Browse Source
This commit is contained in:
Josh Tynjala
2025-03-03 13:19:35 -08:00
parent d7b2b75f1e 3aa32e2167
commit 9f9a5b9f31
22 changed files with 188 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@@ -874,7 +874,7 @@ jobs:
notify:
runs-on: ubuntu-20.04
needs: [package-haxelib, docs, android, flash-samples, air-samples, hashlink-samples, html5-samples, ios, linux, macos, neko-samples, windows]
needs: [package-haxelib, docs, android, flash-samples, air-samples, hashlink-samples, hashlinkc-samples, html5-samples, ios, linux, macos, neko-samples, windows]
if: ${{ github.repository == 'openfl/lime' && github.event_name != 'pull_request' }}
steps:
- name: Notify Discord

9
README.md
View File

@@ -107,3 +107,12 @@ Lime currently supports the following targets:
lime test hl
Desktop builds are currently designed to be built on the same host OS
Join the Community
==================
Have a question? Want a new place to hang out?
* [Forums](https://community.openfl.org/c/lime/19)
* [Discord](https://discordapp.com/invite/tDgq8EE)

3
docs/ImportAll.hx
View File

@@ -112,6 +112,7 @@ import lime.net.HTTPRequest;
import lime.net.HTTPRequestHeader;
import lime.net.HTTPRequestMethod;
import lime.net.URIParser;
import lime.system.BackgroundWorker;
import lime.system.CFFI;
import lime.system.CFFIPointer;
import lime.system.Clipboard;
@@ -125,6 +126,7 @@ import lime.system.Sensor;
import lime.system.SensorType;
import lime.system.System;
import lime.system.ThreadPool;
import lime.system.WorkOutput;
import lime.text.harfbuzz.HB;
import lime.text.harfbuzz.HBBlob;
import lime.text.harfbuzz.HBBuffer;
@@ -169,6 +171,7 @@ import lime.ui.Window;
import lime.ui.WindowAttributes;
import lime.utils.ArrayBuffer;
import lime.utils.ArrayBufferView;
import lime.utils.AssetBundle;
import lime.utils.AssetCache;
import lime.utils.AssetLibrary;
import lime.utils.AssetManifest;

2
project/Build.xml
View File

@@ -392,7 +392,7 @@
<files id="native-toolkit-harfbuzz" if="LIME_HARFBUZZ" />
<files id="native-toolkit-jpeg" if="LIME_JPEG" />
<files id="native-toolkit-lzma" if="LIME_LZMA" />
<files id="native-toolkit-mbedtls" if="LIME_MBEDTLS" />
<files id="native-toolkit-mbedtls" if="LIME_MBEDTLS" unless="static_link" />
<files id="native-toolkit-mojoal" if="LIME_MOJOAL" />
<files id="native-toolkit-neko" if="LIME_NEKO" />
<files id="native-toolkit-ogg" if="LIME_OGG" />

2
project/lib/curl

Submodule project/lib/curl updated: 462196e6b4...c12fb3ddaf

28
project/lib/curl-files.xml
View File

@@ -1,4 +1,7 @@
<xml>
<include name="${HXCPP}/project/thirdparty/mbedtls_files.xml" noerror="true" if="static_link"/>
<set name="HAS_HXCPP_MBEDTLS_FLAGS" value="1" if="MBEDTLS_DIR" />
<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="MBEDTLS_DIR"/>
<files id="native-toolkit-curl-depends" >
<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/curl.h" />
@@ -23,7 +26,22 @@
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/zlib/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/axtls" if="NATIVE_TOOLKIT_HAVE_AXTLS" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include" if="NATIVE_TOOLKIT_HAVE_MBEDTLS" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include" if="NATIVE_TOOLKIT_HAVE_MBEDTLS" unless="static_link"/>
<section if="static_link">
<include name="${HXCPP}/project/thirdparty/mbedtls_flags.xml" if="HAS_HXCPP_MBEDTLS_FLAGS" />
<section unless="HAS_HXCPP_MBEDTLS_FLAGS">
<compilerflag value="-I${MBEDTLS_DIR}/include" />
<compilerflag value="-I${HXCPP}/src/hx/libs/ssl" />
<compilerflag value="-I${this_dir}/custom/mbedtls_hxcpp" />
<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;" />
</section>
</section>
<compilerflag value="-DBUILDING_LIBCURL" />
<compilerflag value="-DCURL_STATICLIB" />
@@ -41,7 +59,6 @@
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/asyn-ares.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_multibyte.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/idn_win32.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/inet_ntop.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/inet_pton.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/krb5.c" />
@@ -58,12 +75,12 @@
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/asyn-thread.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/base64.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/bufref.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/cfilters.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/conncache.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/connect.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/content_encoding.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/cookie.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_addrinfo.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_ctype.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_des.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_endian.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_fnmatch.c" />
@@ -76,12 +93,12 @@
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_threads.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/dict.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/doh.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/dotdot.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/dynbuf.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/easy.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/escape.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/file.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/fileinfo.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/fopen.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/formdata.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/ftp.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/ftplistparser.c" />
@@ -89,6 +106,7 @@
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/getinfo.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/gopher.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hash.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/headers.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hmac.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostasyn.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostip.c" />
@@ -103,6 +121,7 @@
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http_proxy.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/if2ip.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/idn.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/imap.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/llist.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/md4.c" />
@@ -113,6 +132,7 @@
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/multi.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/netrc.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/nonblock.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/noproxy.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/parsedate.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/pingpong.c" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/pop3.c" />

0
project/lib/custom/mbedtls_hxcpp/mbedtls_config.h Normal file
View File

5
src/lime/graphics/Image.hx
View File

@@ -1483,6 +1483,11 @@ class Image
__fromBase64(Base64.encode(bytes), type, onload);
return true;
#elseif (lime_cffi && !macro)
if (bytes == null || bytes.length == 0)
{
return false;
}
var imageBuffer:ImageBuffer = null;
#if !cs

3
src/lime/media/openal/AL.hx
View File

@@ -203,7 +203,8 @@ class AL
public static inline var EFFECT_VOCAL_MORPHER:Int = 0x0007;
public static inline var EFFECT_PITCH_SHIFTER:Int = 0x0008;
public static inline var EFFECT_RING_MODULATOR:Int = 0x0009;
public static inline var FFECT_AUTOWAH:Int = 0x000A;
public static inline var FFECT_AUTOWAH:Int = 0x000A; // TODO: deprecate and remove
public static inline var EFFECT_AUTOWAH:Int = 0x000A;
public static inline var EFFECT_COMPRESSOR:Int = 0x000B;
public static inline var EFFECT_EQUALIZER:Int = 0x000C;
/* Auxiliary Effect Slot properties. */

2
src/lime/system/System.hx
View File

@@ -415,7 +415,7 @@ class System
#end
/**
Opens a file with the suste, default application.
Opens a file with the system default application.
In a web browser, opens a URL with target `_blank`.
**/

7
templates/cpp/static/BuildMain.xml
View File

@@ -2,6 +2,10 @@
<include name="${HXCPP}/build-tool/BuildCommon.xml" />
<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" />
<set name="HAS_HXCPP_MBEDTLS_FILES" value="1" if="MBEDTLS_DIR" />
<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
<files id="main">
<file name="Main.cpp" />
@@ -11,6 +15,8 @@
<target id="main" output="Main${DBG}" tool="linker" toolid="exe">
<files id="main" />
<files id="mbedtls" if="HAS_HXCPP_MBEDTLS_FILES" />
<files id="hxcpp_ssl" unless="HAS_HXCPP_MBEDTLS_FILES" />
::foreach ndlls::
<lib name="::path::" />::end::
@@ -35,6 +41,7 @@
<lib name="rpcrt4.lib" />
<lib name="dwrite.lib" />
<lib name="setupapi.lib" />
<lib name="crypt32.lib" />
</section>

4
templates/cpp/static/Main.cpp
View File

@@ -1,6 +1,6 @@
#include <stdio.h>
#if defined(HX_WINDOWS) && !defined(HXCPP_DEBUG)
#if defined(HX_WINDOWS) && !defined(HXCPP_DEBUGGER)
#include <windows.h>
#endif
@@ -14,7 +14,7 @@ extern "C" int lime_openal_register_prims ();
extern "C" int ::nameSafe::_register_prims ();::end::::end::
#if defined(HX_WINDOWS) && !defined(HXCPP_DEBUG)
#if defined(HX_WINDOWS) && !defined(HXCPP_DEBUGGER)
int __stdcall WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
#else
extern "C" int main(int argc, char *argv[]) {

2
templates/ios/template/{{app.file}}.xcodeproj/project.pbxproj
View File

@@ -396,6 +396,7 @@
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
);
OTHER_LDFLAGS = (
"-lmbedtls_hxcpp",
::foreach ndlls:: "-l::name::",
::end::
::foreach linkedLibraries:: "-l::__current__::",
@@ -448,6 +449,7 @@
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
);
OTHER_LDFLAGS = (
"-lmbedtls_hxcpp",
::foreach ndlls:: "-l::name::",
::end::
::foreach linkedLibraries:: "-l::__current__::",

15
templates/ios/template/{{app.file}}/haxe/BuildHxcppMbedtls.xml Normal file
View File

@@ -0,0 +1,15 @@
<xml>
<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" />
<set name="HAS_HXCPP_MBEDTLS_FILES" value="1" if="MBEDTLS_DIR" />
<include name="${HXCPP}/build-tool/BuildCommon.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
<target id="default" output="libmbedtls_hxcpp${DBG}" tool="linker" toolid="static_link">
<files id="mbedtls" if="HAS_HXCPP_MBEDTLS_FILES" />
<files id="hxcpp_ssl" unless="HAS_HXCPP_MBEDTLS_FILES" />
</target>
</xml>

82
templates/ios/template/{{app.file}}/haxe/makefile
View File

@@ -5,18 +5,10 @@ endif
HAXE_BUILDS := $(ARCHS:%=build-haxe-%)
ifeq ("$(ACTION)","clean")
default: clean
else
default: $(HAXE_BUILDS)
endif
ifeq ("$(CONFIGURATION)","Debug")
BUILD_STYLE := Debug
endif
default: debug_print
ifeq ("$(BUILD_STYLE)","Debug")
DEBUG := -debug
CONFIG := Debug
@@ -31,46 +23,48 @@ ifeq ("$(HAXE_OS)","iphonesimulator")
endif
CONFIG := $(CONFIG)-$(HAXE_OS)
LIB_DEST := $(DEBUG)/libApplicationMain.a
LIB_MBEDTLS_DEST := $(DEBUG)/libmbedtls_hxcpp.a
SIMULATOR_ARCH = i386 x86_64
SUFFIX_i386 =
SUFFIX_x86_64 = -64
SUFFIX_armv6 =
SUFFIX_armv7 = -v7
SUFFIX_arm64 = -64
HXCPP_FLAGS_i386 = -D simulator
HXCPP_FLAGS_x86_64 = -D simulator -D HXCPP_M64
HXCPP_FLAGS_armv6 = -D HXCPP_ARMV6
HXCPP_FLAGS_armv7 = -D HXCPP_ARMV7
HXCPP_FLAGS_arm64 = -D HXCPP_ARM64
ifeq ("$(ACTION)","clean")
default: clean
else
default: $(HAXE_BUILDS)
endif
default: debug_print
debug_print:
@echo "Make $(HAXE_BUILDS)"
LIB_BASE := build/$(CONFIG)/::CPP_LIBPREFIX::ApplicationMain$(DEBUG)
LIB_DEST := $(DEBUG)/libApplicationMain.a
build-haxe-i386:
@echo "Haxe simulator build: $(CONFIG)"
haxe Build.hxml -D simulator -cpp build/$(CONFIG) $(DEBUG)
cd build/$(CONFIG); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
cp build/$(CONFIG)/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).iphonesim.a ../lib/i386$(LIB_DEST)
touch ../Classes/Main.mm
build-haxe-x86_64:
@echo "Haxe simulator build: $(CONFIG)-64"
haxe Build.hxml -D simulator -D HXCPP_M64 -cpp build/$(CONFIG)-64 $(DEBUG)
cd build/$(CONFIG)-64; ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
cp build/$(CONFIG)-64/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).iphonesim-64.a ../lib/x86_64$(LIB_DEST)
touch ../Classes/Main.mm
build-haxe-armv6:
@echo "Haxe device build: $(CONFIG)"
haxe Build.hxml -D HXCPP_ARMV6 -cpp build/$(CONFIG) $(DEBUG)
cd build/$(CONFIG); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
cp build/$(CONFIG)/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).iphoneos.a ../lib/armv6$(LIB_DEST)
touch ../Classes/Main.mm
build-haxe-armv7:
@echo "Haxe device build: $(CONFIG)-v7"
haxe Build.hxml -D HXCPP_ARMV7 -cpp build/$(CONFIG)-v7 $(DEBUG)
cd build/$(CONFIG)-v7; ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
cp build/$(CONFIG)-v7/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).iphoneos-v7.a ../lib/armv7$(LIB_DEST)
touch ../Classes/Main.mm
build-haxe-arm64:
@echo "Haxe device build: $(CONFIG)-64"
haxe Build.hxml -D HXCPP_ARM64 -cpp build/$(CONFIG)-64 $(DEBUG)
cd build/$(CONFIG)-64; ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
cp build/$(CONFIG)-64/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).iphoneos-64.a ../lib/arm64$(LIB_DEST)
$(HAXE_BUILDS): build-haxe-%:
@echo "Haxe $(if $(filter $*,$(SIMULATOR_ARCH)),simulator,device) build: $(CONFIG)$(SUFFIX_$*)"
haxe Build.hxml $(HXCPP_FLAGS_$*) -cpp build/$(CONFIG)$(SUFFIX_$*) $(DEBUG)
cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \
haxelib run ::CPP_BUILD_LIBRARY:: Build.xml haxe -Ddestination=$(CURDIR)/../lib/$*$(LIB_DEST) \
-options Options.txt $(DEBUG)
touch ../Classes/Main.mm
cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \
::CPP_CACHE_WORKAROUND:: haxelib run ::CPP_BUILD_LIBRARY:: $(CURDIR)/BuildHxcppMbedtls.xml \
-Ddestination=$(CURDIR)/../lib/$*$(LIB_MBEDTLS_DEST) \
-options $(CURDIR)/build/$(CONFIG)$(SUFFIX_$*)/Options.txt $(DEBUG)
clean:
rm -rf build
.PHONY: default debug_print clean $(HAXE_BUILDS)
.SUFFIXES:

2
templates/tvos/PROJ.xcodeproj/project.pbxproj
View File

@@ -335,6 +335,7 @@
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
);
OTHER_LDFLAGS = (
"-lmbedtls_hxcpp",
::foreach ndlls:: "-l::name::",
::end::
::foreach linkedLibraries:: "-l::__current__::",
@@ -383,6 +384,7 @@
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
);
OTHER_LDFLAGS = (
"-lmbedtls_hxcpp",
::foreach ndlls:: "-l::name::",
::end::
::foreach linkedLibraries:: "-l::__current__::",

15
templates/tvos/PROJ/haxe/BuildHxcppMbedtls.xml Normal file
View File

@@ -0,0 +1,15 @@
<xml>
<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" />
<set name="HAS_HXCPP_MBEDTLS_FILES" value="1" if="MBEDTLS_DIR" />
<include name="${HXCPP}/build-tool/BuildCommon.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
<target id="default" output="libmbedtls_hxcpp${DBG}" tool="linker" toolid="static_link">
<files id="mbedtls" if="HAS_HXCPP_MBEDTLS_FILES" />
<files id="hxcpp_ssl" unless="HAS_HXCPP_MBEDTLS_FILES" />
</target>
</xml>

55
templates/tvos/PROJ/haxe/makefile
View File

@@ -5,18 +5,10 @@ endif
HAXE_BUILDS := $(ARCHS:%=build-haxe-%)
ifeq ("$(ACTION)","clean")
default: clean
else
default: $(HAXE_BUILDS)
endif
ifeq ("$(CONFIGURATION)","Debug")
BUILD_STYLE := Debug
endif
default: debug_print
ifeq ("$(BUILD_STYLE)","Debug")
DEBUG := -debug
CONFIG := Debug
@@ -31,25 +23,42 @@ ifeq ("$(HAXE_OS)","appletvsimulator")
endif
CONFIG := $(CONFIG)-$(HAXE_OS)
LIB_DEST := $(DEBUG)/libApplicationMain.a
LIB_MBEDTLS_DEST := $(DEBUG)/libmbedtls_hxcpp.a
SIMULATOR_ARCH = x86_64
SUFFIX_arm64 = -64
SUFFIX_x86_64 = -64
HXCPP_FLAGS_x86_64 = -D simulator -D HXCPP_M64
HXCPP_FLAGS_arm64 = -D HXCPP_ARM64
ifeq ("$(ACTION)","clean")
default: clean
else
default: $(HAXE_BUILDS)
endif
default: debug_print
debug_print:
@echo "Make $(HAXE_BUILDS)"
LIB_BASE := build/$(CONFIG)/::CPP_LIBPREFIX::ApplicationMain$(DEBUG)
LIB_DEST := $(DEBUG)/libApplicationMain.a
build-haxe-x86_64:
@echo "Haxe simulator build: $(CONFIG)-64"
haxe Build.hxml -D simulator -D HXCPP_M64 -cpp build/$(CONFIG)-64 $(DEBUG)
cd build/$(CONFIG)-64; ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
cp build/$(CONFIG)-64/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).appletvsim-64.a ../lib/x86_64$(LIB_DEST)
touch ../Classes/Main.mm
build-haxe-arm64:
@echo "Haxe device build: $(CONFIG)-64"
haxe Build.hxml -D HXCPP_ARM64 -cpp build/$(CONFIG)-64 $(DEBUG)
cd build/$(CONFIG)-64; ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; haxelib run ::CPP_BUILD_LIBRARY:: Build.xml $(DEBUG) -options Options.txt
cp build/$(CONFIG)-64/::CPP_LIBPREFIX::ApplicationMain$(DEBUG).appletvos-64.a ../lib/arm64$(LIB_DEST)
$(HAXE_BUILDS): build-haxe-%:
@echo "Haxe $(if $(filter $*,$(SIMULATOR_ARCH)),simulator,device) build: $(CONFIG)$(SUFFIX_$*)"
haxe Build.hxml $(HXCPP_FLAGS_$*) -cpp build/$(CONFIG)$(SUFFIX_$*) $(DEBUG)
cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \
haxelib run ::CPP_BUILD_LIBRARY:: Build.xml haxe -Ddestination=$(CURDIR)/../lib/$*$(LIB_DEST) \
-options Options.txt $(DEBUG)
touch ../Classes/Main.mm
cd build/$(CONFIG)$(SUFFIX_$*); ::HAXELIB_PATH:: export HXCPP_NO_COLOR=1; \
::CPP_CACHE_WORKAROUND:: haxelib run ::CPP_BUILD_LIBRARY:: $(CURDIR)/BuildHxcppMbedtls.xml \
-Ddestination=$(CURDIR)/../lib/$*$(LIB_MBEDTLS_DEST) \
-options $(CURDIR)/build/$(CONFIG)$(SUFFIX_$*)/Options.txt $(DEBUG)
clean:
rm -rf build
.PHONY: default debug_print clean $(HAXE_BUILDS)
.SUFFIXES:

6
tools/CommandLineTools.hx
View File

@@ -952,6 +952,12 @@ class CommandLineTools
Log.println(" " + Log.accentColor + "Options:" + Log.resetColor);
Log.println("");
if (command == "setup")
{
Log.println(" \x1b[1m-cli\x1b[0;3m/\x1b[0m\x1b[1m-alias\x1b[0m -- Set up " + defaultLibraryName + " alias only, skipping haxelib installs");
Log.println(" \x1b[1m-noalias\x1b[0m -- Do not set up " + defaultLibraryName + " alias");
}
if (isBuildCommand)
{
Log.println(" \x1b[1m-D\x1b[0;3mvalue\x1b[0m -- Specify a define to use when processing other commands");

17
tools/platforms/IOSPlatform.hx
View File

@@ -336,22 +336,7 @@ class IOSPlatform extends PlatformTarget
context.IOS_COMPILER = project.config.getString("ios.compiler", "clang");
context.CPP_BUILD_LIBRARY = project.config.getString("cpp.buildLibrary", "hxcpp");
var json = Json.parse(File.getContent(Haxelib.getPath(new Haxelib("hxcpp"), true) + "/haxelib.json"));
var version = Std.string(json.version);
var versionSplit = version.split(".");
while (versionSplit.length > 2)
versionSplit.pop();
if (Std.parseFloat(versionSplit.join(".")) > 3.1)
{
context.CPP_LIBPREFIX = "lib";
}
else
{
context.CPP_LIBPREFIX = "";
}
context.CPP_CACHE_WORKAROUND = "unset HXCPP_COMPILE_CACHE;";
context.IOS_LINKER_FLAGS = ["-stdlib=libc++"].concat(project.config.getArrayString("ios.linker-flags"));
context.IOS_NON_EXEMPT_ENCRYPTION = project.config.getBool("ios.non-exempt-encryption", false);

17
tools/platforms/TVOSPlatform.hx
View File

@@ -267,22 +267,7 @@ class TVOSPlatform extends PlatformTarget
context.IOS_COMPILER = project.config.getString("tvos.compiler", "clang");
context.CPP_BUILD_LIBRARY = project.config.getString("cpp.buildLibrary", "hxcpp");
var json = Json.parse(File.getContent(Haxelib.getPath(new Haxelib("hxcpp"), true) + "/haxelib.json"));
var version = Std.string(json.version);
var versionSplit = version.split(".");
while (versionSplit.length > 2)
versionSplit.pop();
if (Std.parseFloat(versionSplit.join(".")) > 3.1)
{
context.CPP_LIBPREFIX = "lib";
}
else
{
context.CPP_LIBPREFIX = "";
}
context.CPP_CACHE_WORKAROUND = "unset HXCPP_COMPILE_CACHE;";
context.IOS_LINKER_FLAGS = ["-stdlib=libc++"].concat(project.config.getArrayString("tvos.linker-flags"));
context.IOS_NON_EXEMPT_ENCRYPTION = project.config.getBool("tvos.non-exempt-encryption", true);

32
tools/utils/PlatformSetup.hx
View File

@@ -875,13 +875,16 @@ class PlatformSetup
var installedCommand = false;
var answer = YES;
if (targetFlags.exists("y"))
if (!(targetFlags.exists("alias") || targetFlags.exists("cli")))
{
Sys.println("Do you want to install the \"lime\" command? [y/n/a] y");
}
else
{
answer = CLIHelper.ask("Do you want to install the \"lime\" command?");
if (targetFlags.exists("y"))
{
Sys.println("Do you want to install the \"lime\" command? [y/n/a] y");
}
else
{
answer = CLIHelper.ask("Do you want to install the \"lime\" command?");
}
}
if (answer == YES || answer == ALWAYS)
@@ -1123,13 +1126,16 @@ class PlatformSetup
var installedCommand = false;
var answer = YES;
if (targetFlags.exists("y"))
if (!(targetFlags.exists("alias") || targetFlags.exists("cli")))
{
Sys.println("Do you want to install the \"openfl\" command? [y/n/a] y");
}
else
{
answer = CLIHelper.ask("Do you want to install the \"openfl\" command?");
if (targetFlags.exists("y"))
{
Sys.println("Do you want to install the \"openfl\" command? [y/n/a] y");
}
else
{
answer = CLIHelper.ask("Do you want to install the \"openfl\" command?");
}
}
if (answer == YES || answer == ALWAYS)
@@ -1232,6 +1238,8 @@ class PlatformSetup
var message = "Absolute path to a custom version of HashLink.";
if (ConfigHelper.getConfigValue("HL_PATH") == null) {
message += " Leave empty to use Lime's default bundled version.";
} else {
message += " Leave empty to keep the currently configured version. To restore Lime's default bundled version, run the command: lime config remove HL_PATH";
}
getDefineValue("HL_PATH", message);
if (System.hostPlatform == MAC)