finished building on desktop

EleutherAI · Jul 31, 2023 · 994c497 · 994c497
1 parent b14ca6f
commit 994c497
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,10 @@
+/.venv
+/tags
+/tags.lock
+/tags.temp
+/*-*-*-*-*.conf
+/*-*-*-*-*/
+
 ## Editors and development environments
 *~
 *.swp

diff --git a/.gitmodules b/.gitmodules
@@ -1,14 +1,13 @@
 [submodule "lib/irrlichtmt"]
  path = lib/irrlichtmt
- url = git@github.com:EleutherAI/irrlicht.git 
+ url = https://github.com/EleutherAI/irrlicht 
  branch = headless-rendering
-
 [submodule "lib/zmqpp"]
  path = lib/zmqpp
- url = git@github.com:zeromq/zmqpp.git
+ url = https://github.com/zeromq/zmqpp
 [submodule "games/minetest_game"]
  path = games/minetest_game
- url = git@github.com:minetest/minetest_game.git
+ url = https://github.com/minetest/minetest_game
 [submodule "lib/SDL"]
  path = lib/SDL
- url = git@github.com:libsdl-org/SDL.git
+ url = https://github.com/libsdl-org/SDL
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 project(minetest)
 set(PROJECT_NAME_CAPITALIZED "Minetest")
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(GCC_MINIMUM_VERSION "5.1")
 set(CLANG_MINIMUM_VERSION "3.5")

diff --git a/Makefile b/Makefile
@@ -4,16 +4,17 @@ MINETESTER_VERSION := 0.0.1
 SDL2_CMAKE_FILE := lib/SDL/build/lib/cmake/SDL2/sdl2-config.cmake
 ZMQPP_LIB_FILE := lib/zmqpp/build/max-g++/libzmqpp.a
 MINETEST_BINARY := bin/minetest
-MINETESTER_WHEEL := build/package/wheel/minetester-$(MINETESTER_VERSION)-py3-none-manylinux_2_35_x86_64.whl
+MINETESTER_WHEEL := build/package/wheel/minetester-$(MINETESTER_VERSION)-py3-none-any.whl
 
 default: minetest 
 
-deb_deps:
+linux_deps:
  # Install debian dependencies
  util/minetester/install_deps.sh
 
 python_build_deps:
  # Install python build dependencies
+ pip install --upgrade pip
  pip install -r build_requirements.txt
 
 repos:

diff --git a/games/minetest_game b/games/minetest_game
diff --git a/util/minetester/build_minetester.sh b/util/minetester/build_minetester.sh
@@ -22,11 +22,10 @@ python -m build
 
 #Update RPATHS and add relevant libraries to wheel
 cd dist
-auditwheel repair minetester-*.*.*-py3-none-any.whl --plat manylinux_2_35_x86_64
+# auditwheel repair minetester-*.*.*-py3-none-any.whl --plat manylinux_2_35_x86_64
 
 cd ../../..
 
 mkdir build/package/wheel
 
-cp build/package/dist/wheelhouse/minetester-*.*.*-py3-none-manylinux_2_35_x86_64.whl build/package/wheel
-
+cp build/package/dist/minetester-*.*.*-py3-none-manylinux_2_35_x86_64.whl build/package/wheel
diff --git a/util/minetester/install_deps.sh b/util/minetester/install_deps.sh
@@ -8,8 +8,11 @@ if [ "$OS" == "Ubuntu" ]; then
  # If it's Ubuntu, execute the command
  echo "You are running Ubuntu. Executing command..."
  sudo apt-get install xvfb g++ make libzmq3-dev libtool pkg-config build-essential autoconf automake libc6-dev cmake libpng-dev libjpeg-dev libxi-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev libluajit-5.1-dev protobuf-compiler patchelf
+elif [ "$OS" == "Arch" ]; then
+ echo "You are running Arch. Executing command..."
+ sudo pacman -S base-devel libcurl-gnutls cmake libxi libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd gettext
 else
  # If it's not Ubuntu, print a message and exit
- echo "This script only works on Ubuntu. Exiting."
+ echo "This script only works on Ubuntu or Arch. See https://github.com/minetest/minetest/blob/master/doc/compiling/linux.md for instructions on installing your necessary dependencies. Exiting."
  exit 1
 fi