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

Emscripten fixes

Browse Source
This commit is contained in:
Joshua Granick
2018-09-17 12:17:35 -07:00
parent 1f779edc0e
commit a89279d1b7
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/Build.xml
View File

@@ -23,9 +23,9 @@
<!-- <set name="LIME_NEKO" value="1" if="linux" /> --> <!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
<set name="LIME_OGG" value="1" /> <set name="LIME_OGG" value="1" />
<set name="LIME_OPENALSOFT" value="1" if="windows || linux || android" unless="static_link" /> <set name="LIME_OPENALSOFT" value="1" if="windows || linux || android" unless="static_link" />
<set name="LIME_MOJOAL" value="1" if="switch || static_link || winrt || mojoal" />
<unset name="LIME_OPENALSOFT" if="LIME_MOJOAL" />
<set name="LIME_OPENAL" value="1" if="mac || iphone || emscripten || tvos" /> <set name="LIME_OPENAL" value="1" if="mac || iphone || emscripten || tvos" />
<set name="LIME_MOJOAL" value="1" if="switch || static_link || winrt || mojoal" unless="LIME_OPENAL" />
<unset name="LIME_OPENALSOFT" if="LIME_MOJOAL" />
<set name="LIME_OPENAL" value="1" if="LIME_OPENALSOFT" /> <set name="LIME_OPENAL" value="1" if="LIME_OPENALSOFT" />
<set name="LIME_OPENAL" value="1" if="LIME_MOJOAL" /> <set name="LIME_OPENAL" value="1" if="LIME_MOJOAL" />
<set name="LIME_OPENGL" value="1" /> <set name="LIME_OPENGL" value="1" />
@@ -36,7 +36,7 @@
<set name="LIME_SDL_ANGLE" value="1" if="windows LIME_SDL_ANGLE" unless="static_link" /> <set name="LIME_SDL_ANGLE" value="1" if="windows LIME_SDL_ANGLE" unless="static_link" />
<set name="LIME_SDL_ANGLE" value="1" if="windows angle" unless="static_link" /> <set name="LIME_SDL_ANGLE" value="1" if="windows angle" unless="static_link" />
<set name="LIME_SDL_ANGLE" value="1" if="winrt" unless="static_link" /> <set name="LIME_SDL_ANGLE" value="1" if="winrt" unless="static_link" />
<set name="LIME_TINYFILEDIALOGS" value="1" if="windows || mac || linux" unless="winrt" /> <set name="LIME_TINYFILEDIALOGS" value="1" if="windows || mac || linux" unless="winrt || emscripten" />
<set name="LIME_VORBIS" value="1" /> <set name="LIME_VORBIS" value="1" />
<!-- <set name="LIME_VPX" value="1" /> <!-- <set name="LIME_VPX" value="1" />
<set name="LIME_WEBM" value="1" /> --> <set name="LIME_WEBM" value="1" /> -->

8
project/src/ExternalInterface.cpp
View File

@@ -704,7 +704,6 @@ namespace lime {
HL_PRIM vbyte* hl_lime_file_dialog_open_directory (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) { HL_PRIM vbyte* hl_lime_file_dialog_open_directory (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) {
#ifndef EMSCRIPTEN
#ifdef LIME_TINYFILEDIALOGS #ifdef LIME_TINYFILEDIALOGS
std::wstring* _title = hxstring_to_wstring (title); std::wstring* _title = hxstring_to_wstring (title);
@@ -732,7 +731,6 @@ namespace lime {
} }
#endif
#endif #endif
return NULL; return NULL;
@@ -775,7 +773,6 @@ namespace lime {
HL_PRIM vbyte* hl_lime_file_dialog_open_file (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) { HL_PRIM vbyte* hl_lime_file_dialog_open_file (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) {
#ifndef EMSCRIPTEN
#ifdef LIME_TINYFILEDIALOGS #ifdef LIME_TINYFILEDIALOGS
std::wstring* _title = hxstring_to_wstring (title); std::wstring* _title = hxstring_to_wstring (title);
@@ -803,7 +800,6 @@ namespace lime {
} }
#endif
#endif #endif
return NULL; return NULL;
@@ -846,7 +842,6 @@ namespace lime {
HL_PRIM hl_varray* hl_lime_file_dialog_open_files (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) { HL_PRIM hl_varray* hl_lime_file_dialog_open_files (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) {
#ifndef EMSCRIPTEN
#ifdef LIME_TINYFILEDIALOGS #ifdef LIME_TINYFILEDIALOGS
std::wstring* _title = hxstring_to_wstring (title); std::wstring* _title = hxstring_to_wstring (title);
@@ -877,7 +872,6 @@ namespace lime {
#else #else
hl_varray* result = hl_alloc_array (&hlt_bytes, 0); hl_varray* result = hl_alloc_array (&hlt_bytes, 0);
#endif #endif
#endif
return result; return result;
@@ -919,7 +913,6 @@ namespace lime {
HL_PRIM vbyte* hl_lime_file_dialog_save_file (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) { HL_PRIM vbyte* hl_lime_file_dialog_save_file (hl_vstring* title, hl_vstring* filter, hl_vstring* defaultPath) {
#ifndef EMSCRIPTEN
#ifdef LIME_TINYFILEDIALOGS #ifdef LIME_TINYFILEDIALOGS
std::wstring* _title = hxstring_to_wstring (title); std::wstring* _title = hxstring_to_wstring (title);
@@ -947,7 +940,6 @@ namespace lime {
} }
#endif
#endif #endif
return NULL; return NULL;