chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 2.1.5: Fix GLAD loading on Linux, experimental multi-CCD.

Browse Source 
PiperOrigin-RevId: 441482552
Change-Id: I16b7ba81cd81ca2293a9a12bfa08a40ab24c70bb
This commit is contained in:
Saran Tunyasuvunakool
2022-04-13 16:22:26 +01:00
parent 55c1c91382
commit 87539dbd24
18 changed files with 132 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sample/Makefile.macos
+8 -8
View File
@@ -12,12 +12,12 @@ CFLAGS=-O2 -I$(MUJOCO_INCLUDEDIR) -I$(HOMEBREW)/include -pthread
ALLFLAGS=$(CFLAGS) -L$(MUJOCO_LIBDIR) -L$(HOMEBREW)/lib -std=c++11 -stdlib=libc++ -Wl,-rpath,/Applications/MuJoCo.app/Contents/Frameworks
all:
clang++ $(ALLFLAGS) testxml.cc -lmujoco.2.1.4 -o testxml
clang++ $(ALLFLAGS) testspeed.cc -lmujoco.2.1.4 -o testspeed
clang++ $(ALLFLAGS) compile.cc -lmujoco.2.1.4 -o compile
clang++ $(ALLFLAGS) derivative.cc -lmujoco.2.1.4 -o derivative
clang++ $(ALLFLAGS) basic.cc -lmujoco.2.1.4 -lglfw -o basic
clang++ $(ALLFLAGS) record.cc -lmujoco.2.1.4 -lglfw -o record
clang -c $(CFLAGS) uitools.c
clang++ $(ALLFLAGS) uitools.o simulate.cc -lmujoco.2.1.4 -lglfw -o simulate
clang++ $(ALLFLAGS) testxml.cc -lmujoco.2.1.5 -o testxml
clang++ $(ALLFLAGS) testspeed.cc -lmujoco.2.1.5 -o testspeed
clang++ $(ALLFLAGS) compile.cc -lmujoco.2.1.5 -o compile
clang++ $(ALLFLAGS) derivative.cc -lmujoco.2.1.5 -o derivative
clang++ $(ALLFLAGS) basic.cc -lmujoco.2.1.5 -lglfw -o basic
clang++ $(ALLFLAGS) record.cc -lmujoco.2.1.5 -lglfw -o record
clang -c $(CFLAGS) uitools.c
clang++ $(ALLFLAGS) uitools.o simulate.cc -lmujoco.2.1.5 -lglfw -o simulate
rm *.o