From 1601ab60781f57885b4ace100660438e56d738f2 Mon Sep 17 00:00:00 2001 From: Yuval Tassa Date: Mon, 1 Jul 2024 05:50:56 -0700 Subject: [PATCH] Remove Makefiles. Fixes #402 These are no longer needed, as the open-source build uses CMake. PiperOrigin-RevId: 648340374 Change-Id: Ibc704ca3aaab1c48d245e24b071bed6cd846c110 --- sample/Makefile | 12 ------------ sample/Makefile.macos | 18 ------------------ sample/Makefile.windows | 17 ----------------- simulate/Makefile | 11 ----------- simulate/Makefile.macos | 18 ------------------ simulate/Makefile.windows | 13 ------------- 6 files changed, 89 deletions(-) delete mode 100644 sample/Makefile delete mode 100644 sample/Makefile.macos delete mode 100644 sample/Makefile.windows delete mode 100644 simulate/Makefile delete mode 100644 simulate/Makefile.macos delete mode 100644 simulate/Makefile.windows diff --git a/sample/Makefile b/sample/Makefile deleted file mode 100644 index 3f2949d263..0000000000 --- a/sample/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# This Makefile assumes that you have GLFW libraries and headers installed on, -# 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++17 -pthread -Wl,-no-as-needed -Wl,-rpath,'$$ORIGIN'/../lib - -.PHONY: all -all: - $(CXX) $(COMMON) testspeed.cc -lmujoco -o ../bin/testspeed - $(CXX) $(COMMON) compile.cc -lmujoco -o ../bin/compile - $(CXX) $(COMMON) basic.cc -lmujoco -lglfw -o ../bin/basic - $(CXX) $(COMMON) record.cc -lmujoco -lglfw -o ../bin/record diff --git a/sample/Makefile.macos b/sample/Makefile.macos deleted file mode 100644 index 07cd830ea0..0000000000 --- a/sample/Makefile.macos +++ /dev/null @@ -1,18 +0,0 @@ -# This Makefile assumes that GLFW is installed via Homebrew. -# If your setup is different, you will need to set GLFWROOT manually. - -# This Makefile also assumes that MuJoCo.app is present in /Applications. - -GLFWROOT?=$(shell brew --prefix) -MUJOCOPATH?=/Applications/MuJoCo.app/Contents/Frameworks - -CFLAGS=-O2 -F$(MUJOCOPATH) -I$(GLFWROOT)/include -pthread -CXXFLAGS=$(CFLAGS) -std=c++17 -stdlib=libc++ -ALLFLAGS=$(CXXFLAGS) -L$(GLFWROOT)/lib -Wl,-rpath,$(MUJOCOPATH) - -.PHONY: all -all: - clang++ $(ALLFLAGS) testspeed.cc -framework mujoco -o testspeed - clang++ $(ALLFLAGS) compile.cc -framework mujoco -o compile - clang++ $(ALLFLAGS) basic.cc -framework mujoco -lglfw -o basic - clang++ $(ALLFLAGS) record.cc -framework mujoco -lglfw -o record diff --git a/sample/Makefile.windows b/sample/Makefile.windows deleted file mode 100644 index 9aa858c3a5..0000000000 --- a/sample/Makefile.windows +++ /dev/null @@ -1,17 +0,0 @@ -# A copy of the GLFW library is required to build some sample programs. -# If this is not already installed on your system, download the WIN64 archive -# from https://github.com/glfw/glfw/releases, and copy files as follows: -# - Copy the entire `include/GLFW` subdirectory to `mujoco/include/GLFW`. -# - Copy glfw3dll.lib from the subdirectory corresponding into your compiler -# choice to `mujoco/lib/glfw3dll.lib`. -# - Copy glfw3.dll from the same subdirectory into `mujoco/bin/glfw3.dll`. - -COMMON=/O2 /MT /EHsc /arch:AVX /I../include /Fe../bin/ - -.PHONY: all -all: - cl $(COMMON) testspeed.cc ../lib/mujoco.lib - cl $(COMMON) compile.cc ../lib/mujoco.lib - cl $(COMMON) basic.cc ../lib/glfw3dll.lib ../lib/mujoco.lib - cl $(COMMON) record.cc ../lib/glfw3dll.lib ../lib/mujoco.lib - del *.obj diff --git a/simulate/Makefile b/simulate/Makefile deleted file mode 100644 index f0834cbee1..0000000000 --- a/simulate/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# This Makefile assumes that you have GLFW libraries and headers installed on, -# 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 -pthread -Wl,-no-as-needed -Wl,-rpath,'$$ORIGIN'/../lib - -all: - $(CXX) $(COMMON) -std=c++17 -c simulate.cc - $(CC) $(COMMON) -std=c11 -c uitools.c - $(CXX) $(COMMON) -std=c++17 main.cc simulate.o uitools.o -lmujoco -lglfw -o ../bin/simulate - rm uitools.o simulate.o diff --git a/simulate/Makefile.macos b/simulate/Makefile.macos deleted file mode 100644 index ae401473e6..0000000000 --- a/simulate/Makefile.macos +++ /dev/null @@ -1,18 +0,0 @@ -# This Makefile assumes that GLFW is installed via Homebrew. -# If your setup is different, you will need to set GLFWROOT manually. - -# This Makefile also assumes that MuJoCo.app is present in /Applications. - -GLFWROOT?=$(shell brew --prefix) -MUJOCOPATH?=/Applications/MuJoCo.app/Contents/Frameworks - -CFLAGS=-O2 -F$(MUJOCOPATH) -I$(GLFWROOT)/include -pthread -CXXFLAGS=$(CFLAGS) -std=c++17 -stdlib=libc++ -ALLFLAGS=$(CXXFLAGS) -L$(GLFWROOT)/lib -Wl,-rpath,$(MUJOCOPATH) - -all: - clang++ $(CXXFLAGS) -c macos_gui.mm - clang++ $(CXXFLAGS) -c simulate.cc - clang $(CFLAGS) -std=c11 -c uitools.c - clang++ $(CXXFLAGS) main.cc macos_gui.o simulate.o uitools.o -framework mujoco -framework Cocoa -lglfw -o simulate - rm *.o diff --git a/simulate/Makefile.windows b/simulate/Makefile.windows deleted file mode 100644 index 957929e48d..0000000000 --- a/simulate/Makefile.windows +++ /dev/null @@ -1,13 +0,0 @@ -# A copy of the GLFW library is required to build some sample programs. -# If this is not already installed on your system, download the WIN64 archive -# from https://github.com/glfw/glfw/releases, and copy files as follows: -# - Copy the entire `include/GLFW` subdirectory to `mujoco/include/GLFW`. -# - Copy glfw3dll.lib from the subdirectory corresponding into your compiler -# choice to `mujoco/lib/glfw3dll.lib`. -# - Copy glfw3.dll from the same subdirectory into `mujoco/bin/glfw3.dll`. - -COMMON=/O2 /MT /EHsc /arch:AVX /I../include /Fe../bin/ - -all: - cl $(COMMON) main.cc simulate.cc uitools.c ../lib/glfw3dll.lib ../lib/mujoco.lib - del *.obj