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

Version 2.1.4: Switch to GLAD, minor improvements to simulate.

Browse Source 
PiperOrigin-RevId: 439277749
Change-Id: I741d1c499ae88753338fcc6d141a65e92e13023e
This commit is contained in:
Saran Tunyasuvunakool
2022-04-04 13:53:21 +01:00
parent 3c71720d83
commit 90dea1bdfb
23 changed files with 270 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sample/Makefile.macos
+12 -10
View File
@@ -2,20 +2,22 @@
# packages are installed in /usr/local. If your setup is different, you will
# need to adjust the HOMEBREW variable accordingly.
# This Makefile also assumes that MuJoCo.app is present in /Applications.
HOMEBREW?=/usr/local
MUJOCO_LIBDIR=../MuJoCo.Framework/Versions/A
MUJOCO_INCLUDEDIR=../MuJoCo.Framework/Versions/A/Headers
MUJOCO_LIBDIR=/Applications/MuJoCo.app/Contents/Frameworks/MuJoCo.Framework/Versions/A
MUJOCO_INCLUDEDIR=/Applications/MuJoCo.app/Contents/Frameworks/MuJoCo.Framework/Versions/A/Headers
CFLAGS=-O2 -I$(MUJOCO_INCLUDEDIR) -I$(HOMEBREW)/include -pthread
ALLFLAGS=$(CFLAGS) -L$(MUJOCO_LIBDIR) -L$(HOMEBREW)/lib -std=c++11 -stdlib=libc++
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.3 -o testxml
clang++ $(ALLFLAGS) testspeed.cc -lmujoco.2.1.3 -o testspeed
clang++ $(ALLFLAGS) compile.cc -lmujoco.2.1.3 -o compile
clang++ $(ALLFLAGS) derivative.cc -lmujoco.2.1.3 -o derivative
clang++ $(ALLFLAGS) basic.cc -lmujoco.2.1.3 -lglfw -o basic
clang++ $(ALLFLAGS) record.cc -lmujoco.2.1.3 -lglfw -o record
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.3 -lglfw -o simulate
clang++ $(ALLFLAGS) uitools.o simulate.cc -lmujoco.2.1.4 -lglfw -o simulate
rm *.o