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

Emscripten fix

Browse Source
This commit is contained in:
Joshua Granick
2014-08-29 12:39:15 -07:00
parent d68f0ddfa2
commit 6510d41c2c
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include.xml
View File

@@ -20,8 +20,6 @@
<ndll name="lime" if="included" />
<ndll name="libfreetype" register="false" if="emscripten" />
<ndll name="curl_ssl" register="false" if="ios" />
<ndll name="png" register="false" if="ios" />
<ndll name="jpeg" register="false" if="ios" />
@@ -44,9 +42,9 @@
<target name="console-pc" handler="lime-console-pc" />
<haxelib name="lime-console-pc" if="console-pc" />
<haxedef name="lime-curl" unless="lime-console" />
<haxedef name="lime-curl" unless="lime-console || emscripten" />
<haxedef name="lime-opengl" unless="lime-console" />
<haxedef name="lime-openal" unless="lime-console || static_link" />
<haxedef name="lime-openal" unless="lime-console || static_link || emscripten" />
</section>

4
project/Build.xml
View File

@@ -8,13 +8,13 @@
<set name="ios" value="1" if="iphone" />
<set name="LIME_CURL" value="1" />
<set name="LIME_CURL" value="1" unless="emscripten" />
<set name="LIME_JPEG" value="1" />
<set name="LIME_FREETYPE" value="1" />
<set name="LIME_HARFBUZZ" value="1" />
<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
<set name="LIME_OGG" value="1" />
<set name="LIME_OPENAL" value="1" unless="android" />
<set name="LIME_OPENAL" value="1" unless="android || emscripten" />
<set name="LIME_OPENGL" value="1" />
<set name="LIME_PNG" value="1" />
<set name="LIME_SDL" value="1" />

2
project/src/system/System.cpp
View File

@@ -104,7 +104,7 @@ namespace lime {
#elif defined (GPH) || defined (HX_LINUX) || defined (EMSCRIPTEN)
struct timeval tv;
if (gettimeofday (&tv, NULL))
if (gettimeofday (&tv, 0))
return 0;
double t = (tv.tv_sec + ((double)tv.tv_usec) / 1000000.0);