Merge pull request #9 from mathworks-robotics/glfwMakeFix

glfw path in makefile
mathworks-robotics · Dec 10, 2023 · 826380c · 826380c
2 parents 6f54e19 + b1a9ce8
commit 826380c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/tools/Makefile b/tools/Makefile
@@ -63,7 +63,7 @@ CPP_FLAG=COMPFLAGS="/EHsc /std:c++17"
 LINKFLAGS=
 endif
 
-LINKER_OBJ_LINUX=-L$(MJ_PATH)/lib -l$(MJ_LIB_NAME) -lGL -lglfw
+LINKER_OBJ_LINUX=-L$(MJ_PATH)/lib -L/usr/local/lib -l$(MJ_LIB_NAME) -lGL -lglfw
 
 # MEX COMMAND
 BUILD_CMD_COMMON=$(MEX) $(SRC_COMMON) $(INC_PATH) -outdir $(OUT_DIR)

diff --git a/tools/setupBuild.m b/tools/setupBuild.m
@@ -20,6 +20,8 @@ function setupBuild()
     fprintf(fileID, "WIN_COMPILER=%s\n", selectedCompilerWin);
     fprintf(fileID, "SET_GLFW_INC_PATH=-I%s\n", getUnixPath( getpref('mujoco', 'glfwIncPath')));
     fprintf(fileID, "SET_GLFW_IMPORTLIB_PATH=%s\n", getUnixPath( getpref('mujoco', 'glfwImportLibPath')) );
+else
+    fprintf(fileID, "SET_GLFW_INC_PATH=-I/usr/local/include\n");
 end
 disp('compiler selection and GLFW inc/import path setup done')
 mjLibName = "mujoco";