From 6b7138046e594712903b08905edee4d0af851ef9 Mon Sep 17 00:00:00 2001 From: Kristjan Kongas Date: Tue, 24 Dec 2019 23:34:46 +0200 Subject: [PATCH] Move PhaseTransition.html to PhaseTransition/ and fix README --- CMakeLists.txt | 2 +- {Tests => PhaseTransition}/PhaseTransition.html | 0 README.md | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {Tests => PhaseTransition}/PhaseTransition.html (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5bab58..b57cd9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ if(EMSCRIPTEN) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_SDL=2 -s USE_SDL_TTF=2 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --embed-file ${CMAKE_SOURCE_DIR}/Setups@PhaseTransition") - configure_file(Tests/PhaseTransition.html PhaseTransition.html COPY_ONLY) + configure_file(PhaseTransition/PhaseTransition.html PhaseTransition.html COPY_ONLY) else() include_directories(${SDL2_INCLUDE_DIRS} ${SDL2TTF_INCLUDE_DIR} ${SDL2_IMAGE_INCLUDE_DIR} .) diff --git a/Tests/PhaseTransition.html b/PhaseTransition/PhaseTransition.html similarity index 100% rename from Tests/PhaseTransition.html rename to PhaseTransition/PhaseTransition.html diff --git a/README.md b/README.md index b77c046..e521ba4 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Building: * Create and change working directory to build directory: `mkdir build && cd build` * Build, run tests and program on Linux: `cmake -D CMAKE_BUILD_TYPE=Release .. && make && ./RunTests && ./PhaseTransition ../Setups/default.txt`, where `./RunTests` is optional. -* Build for web using emscripten: `emconfigure cmake -D CMAKE_BUILD_TYPE=Release .. && emmake make`. This should generate PhaseTransition html, js and wasm files. You probably need a web server to actually run this in your browser: `python -m http.server 8080` (still from the build directory). Then go to . Currently the web build is slow because it's single-threaded. +* Build for web using emscripten: `emconfigure cmake -D CMAKE_BUILD_TYPE=Release .. && emmake make`. This should generate PhaseTransition html, js and wasm files. You probably need a web server to actually run this in your browser: `python3 -m http.server 8080` (still from the build directory). Then go to . Currently the web build is slow because it's single-threaded. Default simulation resolution, particle properties, etc. can be modified in Setups/default.txt. For web build, modify Setups/web.txt and force a rebuild by removing all files in the build directory.