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

Simulate: Use new cmake system fix build errors introduced with rebase

Browse Source
This commit is contained in:
Levi Burner
2022-05-24 12:11:27 -04:00
parent 033ca81db6
commit 1d4461fce6
13 changed files with 774 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simulate/Makefile
+4 -5
View File
@@ -2,12 +2,11 @@
# which is commonly available through your distro's package manager.
# On Debian and Ubuntu, GLFW can be installed via `apt install libglfw3-dev`.
COMMON=-O2 -I../include -L../lib -std=c++11 -pthread -Wl,-rpath,'$$ORIGIN'/../lib
COMMON=-O2 -I../include -L../lib -std=c++17 -pthread -Wl,-no-as-needed -Wl,-rpath,'$$ORIGIN'/../lib
all:
$(CC) -c -O2 -fPIC -I../include uitools.c
$(CXX) -c -O2 -fPIC -I../include simulate.cc
$(CXX) $(COMMON) -shared -Wl,-no-as-needed -Wl,-soname,libmjsimulate.so.2.1.5 -lmujoco -o libmjsimulate.so.2.1.5 simulate.o uitools.o
mv libmjsimulate.so.2.1.5 ../lib/libmjsimulate.so.2.1.5
ln -sf ../lib/libmjsimulate.so.2.1.5 ../lib/libmjsimulate.so
$(CXX) $(COMMON) -Wl,-no-as-needed main.cc -lmjsimulate -lmujoco -lGL -lglfw -o ../bin/simulate
$(CXX) $(COMMON) -shared -lmujoco -o libmjsimulate.so simulate.o uitools.o
mv libmjsimulate.so ../lib/libmjsimulate.so
$(CXX) $(COMMON) main.cc -lmjsimulate -lmujoco -lGL -lglfw -o ../bin/simulate