File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Load diff This file was deleted.
Original file line number Diff line number Diff line change 99# terms of the BSD-3 license. We welcome feedback and contributions, see file
1010# CONTRIBUTING.md for details.
1111
12- MFEM_DIR ?= ../mfem-shm
13- GLVIS_DIR ?= ../glvis-shm
12+ MFEM_DIR ?= ../mfem
13+ GLVIS_DIR ?= ../glvis
1414GLM_ROOT ?= $(abspath ./glm)
1515EMCXX ?= em++
1616EMAR ?= emar
@@ -25,13 +25,14 @@ LIB_GLVIS_JS = $(GLVIS_DIR)/lib/libglvis.js
2525all : $(LIB_GLVIS_JS )
2626
2727$(LIB_MFEM ) :
28- $(MAKE ) -C $(MFEM_DIR ) BUILD_DIR=$(MFEM_BUILD_DIR ) config CXX=$(EMCXX ) \
29- MFEM_TIMER_TYPE=0 MFEM_PRECISION=double
30- $(MAKE ) -C $(MFEM_BUILD_DIR ) -j $(shell nproc) AR=$(EMAR ) ARFLAGS=rcs RANLIB=echo
28+ # ranlib causes problems
29+ @$(MAKE ) -C $(MFEM_DIR ) BUILD_DIR=$(MFEM_BUILD_DIR ) config CXX=$(EMCXX ) \
30+ MFEM_TIMER_TYPE=0 AR=$(EMAR ) ARFLAGS=rcs RANLIB=echo
31+ $(MAKE ) -C $(MFEM_BUILD_DIR ) -j 4
3132
3233$(LIB_GLVIS_JS ) : $(LIB_MFEM )
3334 @$(MAKE ) get_opensans
34- $(MAKE ) -C $(GLVIS_DIR ) -j $( shell nproc ) GLM_DIR=$(GLM_ROOT ) MFEM_DIR=$(MFEM_BUILD_DIR ) \
35+ @ $(MAKE ) -C $(GLVIS_DIR ) GLM_DIR=$(GLM_ROOT ) MFEM_DIR=$(MFEM_BUILD_DIR ) \
3536 GLVIS_USE_LOGO=NO GLVIS_USE_LIBPNG=YES js
3637
3738libmfem : $(LIB_MFEM )
Original file line number Diff line number Diff line change 11version https://git-lfs.github.com/spec/v1
2- oid sha256:fbb600d958e9bcc81599fa9b6bb575470a9ed183a3f21951aeaf0ef5053887bd
3- size 8910225
2+ oid sha256:b1095765ae5020c242643a582c690890b6a4c49835c56c6d9b87628ef787912c
3+ size 8563937
Original file line number Diff line number Diff line change 11const versions = {
2- emscripten : "4.0.15 " ,
3- mfem : "v4.8-1052-ga11c1e8761 " ,
4- glvis : "v4.4-60-g89dee89 " ,
2+ emscripten : "3.1.51 " ,
3+ mfem : "v4.8" ,
4+ glvis : "v4.4" ,
55} ;
You can’t perform that action at this time.
0 commit comments