Browse Source

Emscripten: Fix assets/ loading

pull/3814/head
Gleb Mazovetskiy 4 years ago
parent
commit
a496b9d72b
  1. 1
      CMake/platforms/emscripten.cmake
  2. 4
      CMakeLists.txt
  3. 4
      Source/utils/paths.cpp

1
CMake/platforms/emscripten.cmake

@ -1,4 +1,5 @@
set(BUILD_TESTING OFF)
set(BUILD_ASSETS_MPQ OFF)
set(DISABLE_ZERO_TIER ON)
set(DEVILUTIONX_SYSTEM_SDL_AUDIOLIB OFF)
set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF)

4
CMakeLists.txt

@ -448,6 +448,10 @@ else()
endif()
target_link_libraries(${BIN_TARGET} PRIVATE libdevilutionx)
if(EMSCRIPTEN)
target_link_options(${BIN_TARGET} PRIVATE --preload-file assets)
endif()
if(BUILD_TESTING)
if(ENABLE_CODECOVERAGE)
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")

4
Source/utils/paths.cpp

@ -91,7 +91,11 @@ const std::string &ConfigPath()
const std::string &AssetsPath()
{
if (!assetsPath)
#if __EMSCRIPTEN__
assetsPath.emplace("assets/");
#else
assetsPath.emplace(FromSDL(SDL_GetBasePath()) + "assets/");
#endif
return *assetsPath;
}

Loading…
Cancel
Save