thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DISTS EMSCRIPTEN: set correct datadir (fixed issue with shader loading)

Browse source
This commit is contained in:
Christian Kündig 2021-06-07 14:40:39 +02:00 • committed by Eugene Sandulenko
parent 93e1c779b6
commit 501c7ba7aa
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure vendored
View file

@ -1727,6 +1727,7 @@ wasm32-*)
_endian=little # the endian check below fails, but emscripten is always little endian anyway _endian=little # the endian check below fails, but emscripten is always little endian anyway
_host_os=emscripten _host_os=emscripten
_host_cpu=wasm32 _host_cpu=wasm32
datadir='/'
CXX="em++" CXX="em++"
;; ;;
wii) wii)

2
graphics/opengl/shader.cpp
View file

@ -35,7 +35,6 @@ static const GLchar *readFile(const Common::String &filename) {
#if defined(EMSCRIPTEN) #if defined(EMSCRIPTEN)
// Since we need to bundle all files into data files on Emscripten, we keep all shaders in a different folder // Since we need to bundle all files into data files on Emscripten, we keep all shaders in a different folder
SearchMan.addDirectory("ALL_SHADERS", "/", 0, 2);
#endif #endif
// Allow load shaders from source code directory without install them // Allow load shaders from source code directory without install them
// It's used for development purpose // It's used for development purpose
@ -52,7 +51,6 @@ static const GLchar *readFile(const Common::String &filename) {
SearchMan.remove("STARK_SHADERS"); SearchMan.remove("STARK_SHADERS");
SearchMan.remove("WINTERMUTE_SHADERS"); SearchMan.remove("WINTERMUTE_SHADERS");
#if defined(EMSCRIPTEN) #if defined(EMSCRIPTEN)
SearchMan.remove("ALL_SHADERS");
#endif #endif
const int32 size = file.size(); const int32 size = file.size();