Rename the legacy lime binary to 'lime-legacy'

This commit is contained in:
Joshua Granick
2015-04-04 22:15:29 -07:00
parent a093d456c6
commit 3153f47f22
5 changed files with 6 additions and 8 deletions

View File

@@ -384,7 +384,7 @@ class Timer {
#if lime_legacy #if lime_legacy
static var lime_time_stamp = flash.Lib.load ("lime", "lime_time_stamp", 0); static var lime_time_stamp = flash.Lib.load ("lime-legacy", "lime_time_stamp", 0);
#end #end

View File

@@ -5,7 +5,7 @@ package org.haxe.lime;
public class Lime { public class Lime {
static { static {
System.loadLibrary("lime"); System.loadLibrary("lime-legacy");
} }
public static final int ACTIVATE = 1; public static final int ACTIVATE = 1;

View File

@@ -8,7 +8,7 @@
<ndll name="regexp" haxelib="hxcpp" if="cpp" /> <ndll name="regexp" haxelib="hxcpp" if="cpp" />
<ndll name="zlib" haxelib="hxcpp" if="cpp" unless="ios" /> <ndll name="zlib" haxelib="hxcpp" if="cpp" unless="ios" />
<ndll name="lime" dir="legacy/ndll" /> <ndll name="lime-legacy" dir="legacy/ndll" />
<ndll name="libfreetype" dir="legacy/ndll" register="false" if="emscripten" /> <ndll name="libfreetype" dir="legacy/ndll" register="false" if="emscripten" />
@@ -23,9 +23,6 @@
<architecture name="armv7" if="android" /> <architecture name="armv7" if="android" />
<haxelib name="nme" if="dev setup" />
<haxelib name="nme-dev" if="dev setup" />
</section> </section>
<templatePath name="templates" /> <templatePath name="templates" />

View File

@@ -265,7 +265,7 @@
<set name="LEGACY_POSTLIB" value="${LIBEXTRA}${LEGACY_SLIBEXT}" /> <set name="LEGACY_POSTLIB" value="${LIBEXTRA}${LEGACY_SLIBEXT}" />
<set name="LEGACY_DEBUGEXTRA" value="-debug" if="fulldebug" /> <set name="LEGACY_DEBUGEXTRA" value="-debug" if="fulldebug" />
<target id="lime-legacy" output="${LIBPREFIX}lime${MSVC_LIB_VERSION}${LEGACY_DEBUGEXTRA}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}"> <target id="lime-legacy" output="${LIBPREFIX}lime-legacy${MSVC_LIB_VERSION}${LEGACY_DEBUGEXTRA}${LIBEXTRA}" tool="linker" toolid="${STD_MODULE_LINK}">
<outdir name="${LEGACY_OUTPUT_DIR}/${BINDIR}" /> <outdir name="${LEGACY_OUTPUT_DIR}/${BINDIR}" />

View File

@@ -590,6 +590,7 @@ bool Stage::BuildCache()
int Stage::getKeyboardHeight() int Stage::getKeyboardHeight()
{ {
return 0;
//#ifdef IPHONE //#ifdef IPHONE
//return GetKeyboardHeight(); //return GetKeyboardHeight();
//#endif //#endif