Mostly CMake stuff

.gitignore

@@ -49,6 +49,10 @@ CTestTestfile.cmake
 
 /[Bb]uild*/
 
+## Direnv
+
+/.envrc
+
 ## Nix
 
 /result*

.travis.yml

@@ -4,25 +4,93 @@ dist: bionic
 matrix:
   include:
     - os: linux
-      dist: bionic
-      install: ".travis/linux/deps.sh"
+      dist: bionic # 18.04 LTS
       script: ".travis/linux/build.sh"
+      addons:
+        apt:
+          update: true
+          packages:
+          - curl
+          - libbz2-dev
+          - libcurl3-openssl-dev
+          - libgl1-mesa-dev
+          - libglu1-mesa-dev
+          - libjpeg-dev
+          - liblua5.1-0-dev
+          - libpng-dev
+          - libsdl-mixer1.2-dev
+          - libsdl-net1.2-dev
+          - libsdl-ttf2.0-dev
+          - libsdl1.2-dev
+          - libsqlite3-dev
+          - libxdg-basedir-dev
+          - libxml2-dev
+          - ninja-build
+          - rpm
+          - zlib1g-dev
+      before_install:
+      - ( shopt dotglob; sudo rm -rf /usr/local/cmake/* )
+      - >-
+          curl --retry 2 --retry-delay 30 'https://cmake.org/files/v3.13/cmake-3.13.4-Linux-x86_64.tar.gz' |
+          sudo tar -xz -C /usr/local/cmake --strip-components 1
 
     - os: osx
       osx_image: xcode10.1 # =10.13/high sierra
-      install: ".travis/macos/deps.sh"
       script: ".travis/macos/build.sh"
+      addons:
+        homebrew:
+          update: true
+          packages:
+            - bzip2
+            - cmake
+            - curl
+            - gettext
+            - jpeg
+            - libpng
+            - libxml2
+            - ninja
+            - sdl
+            - sdl_mixer
+            - sdl_net
+            - sdl_ttf
+            - sqlite3
+            - zlib
       cache:
         directories:
           - $HOME/Library/Caches/Homebrew
       before_cache:
         - brew cleanup
 
-    - os: linux
-      dist: bionic
-      name: "Linux MXE"
-      install: ".travis/linux-mxe/deps.sh"
+    - name: "Linux MXE"
+      os: linux
+      dist: bionic # 18.04 LTS
       script: ".travis/linux-mxe/build.sh"
+      env:
+      - MXE_PATH="/usr/lib/mxe"
+      - MXE_HOST="x86_64-pc-linux-gnu"
+      - MXE_TARGET="i686-w64-mingw32.shared"
+      - PATH="$MXE_PATH/usr/bin:$PATH"
+      - MXE_HOST_PFX="$MXE_PATH/usr/$MXE_HOST/bin/$MXE_TARGET"
+      - MXE_CROSS_PFX="$MXE_PATH/usr/bin/$MXE_TARGET"
+      - WINEARCH="win32"
+      # add the MXE DLLs to Wine's path
+      - WINEPATH="$MXE_PATH/usr/$MXE_TARGET/bin${WINEPATH:+:$WINEPATH}"
+      before_install:
+      - sudo git clone "https://github.com/mxe/mxe" "$MXE_PATH"
+      - (cd "$MXE_PATH" && sudo make MXE_TARGETS="$MXE_TARGET"
+          download-{bzip2,cmake,curl,gcc,gettext,jpeg,libpng,libxml2,lzma,nsis,pkgconf,sdl,sdl_mixer,sdl_net,sdl_ttf,smpeg2,sqlite,zlib})
+      addons:
+        apt:
+          update: true
+          sources:
+          # for xvfb
+          - sourceline: 'deb http://archive.ubuntu.com/ubuntu bionic universe'
+          - sourceline: 'deb http://archive.ubuntu.com/ubuntu bionic-updates universe'
+          packages:
+          - ninja-build
+          - wine-stable
+          - wine32
+          - xvfb
 
 deploy:
   provider: releases

.travis/linux-mxe/build.sh

@@ -2,52 +2,19 @@
 
 set -ex
 
-# needed for cmake to find some programs
-export PATH="/usr/lib/mxe/usr/bin:$PATH"
-
 mkdir build && cd build
-mkdir -p /tmp/xmoto
-
-MXE_PATH=/usr/lib/mxe
-MXE_TARGET="i686-w64-mingw32.shared"
-
-is_broken_symlink() {
-  if [ -L "$1" ] && [ ! -e "$1" ]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-relink() {
-  for prog in "$@"; do
-    if is_broken_symlink "$MXE_HOST_PFX-$prog"; then
-      sudo rm "$MXE_HOST_PFX-$prog"
-      sudo ln -s "$MXE_CROSS_PFX-$prog" "$MXE_HOST_PFX-$prog"
-    fi
-  done
-}
-
-MXE_HOST_PFX="$MXE_PATH/usr/x86_64-pc-linux-gnu/bin/$MXE_TARGET"
-MXE_CROSS_PFX="$MXE_PATH/usr/bin/$MXE_TARGET"
-
-# add the mxe DLLs to wine's path
-export WINEPATH="$MXE_PATH/usr/$MXE_TARGET/bin${WINEPATH:+:${WINEPATH}}"
-export WINEARCH=win32
+mkdir -p /tmp/xminstall
 
 echo "MXE_PATH: $MXE_PATH"
 echo "MXE HOST PREFIX: $MXE_HOST_PFX"
 echo "MXE CROSS PREFIX: $MXE_CROSS_PFX"
 echo "WINEPATH: $WINEPATH"
 
-relink "gcc" "g++"
+"$MXE_TARGET-cmake" -D CMAKE_INSTALL_PREFIX=/tmp/xminstall \
+  -D XMOTO_PACK=manual \
+  -D CMAKE_BUILD_TYPE=Release -G Ninja ..
 
-"$MXE_CROSS_PFX-cmake" \
-  -DCMAKE_INSTALL_PREFIX=/tmp/xmoto \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DXMOTO_PACK=manual ..
-
-make -j"$(nproc)"
+ninja
 
 Xvfb :0 -screen 0 1024x768x16 &
 xvfb_pid=$!
@@ -57,7 +24,7 @@ sleep 5
 echo "pidof Xvfb:"
 pidof Xvfb
 
-make xmoto_pack
+ninja xmoto_pack
 
 # not that any reasonable PID 1 responds to SIGTERM anyway ;)
 if [ "$xvfb_pid" -gt 1 ]; then
@@ -67,10 +34,10 @@ fi
 # aaand if the graceful termination doesn't work..
 jobs -p | xargs -r kill -9
 
-#make install
+#ninja install
 
-"$MXE_CROSS_PFX"-cpack -G "NSIS"
-"$MXE_CROSS_PFX"-cpack -G "ZIP"
+"$MXE_TARGET"-cpack -G "NSIS"
+"$MXE_TARGET"-cpack -G "ZIP"
 
 fix_pkg_name() {
   if [ -z "$1" ] || [ -z "$2" ]; then
@@ -88,4 +55,3 @@ for pkg in xmoto-*.exe; do fix_pkg_name "$pkg" "win32-setup"; done
 mkdir artifacts
 mv xmoto-*.exe artifacts/
 mv xmoto-*.zip artifacts/
-

.travis/linux/build.sh

@@ -4,8 +4,8 @@ set -ex
 
 mkdir build && cd build
 mkdir -p /tmp/xminstall
-cmake -DCMAKE_INSTALL_PREFIX=/tmp/xminstall \
-      -DCMAKE_BUILD_TYPE=Release -G Ninja ..
+cmake -D CMAKE_INSTALL_PREFIX=/tmp/xminstall \
+      -D CMAKE_BUILD_TYPE=Release -G Ninja ..
 ninja
 ninja xmoto_pack
 ninja install
@@ -16,4 +16,3 @@ cpack -G "RPM"
 mkdir artifacts
 mv xmoto-*.deb artifacts/
 mv xmoto-*.rpm artifacts/
-

.travis/macos/build.sh

@@ -3,8 +3,8 @@
 set -ex
 
 mkdir build && cd build
-cmake -DCMAKE_BUILD_TYPE=Release \
-      -DBUILD_MACOS_BUNDLE=ON -G Ninja ..
+cmake -D BUILD_MACOS_BUNDLE=ON \
+      -D CMAKE_BUILD_TYPE=Release -G Ninja ..
 ninja
 
 # Homebrew on Catalina (10.15) sets inconsistent permissions on dylibs
@@ -14,4 +14,3 @@ sudo \
 
 mkdir artifacts
 mv xmoto-*.dmg artifacts/
-

CMake/FindLuaTargets.cmake

@@ -0,0 +1,10 @@
+if(LUA_FOUND AND NOT TARGET Lua::Lua)
+  add_library(Lua::Lua UNKNOWN IMPORTED)
+  set_target_properties(Lua::Lua PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}"
+    IMPORTED_LOCATION "${LUA_LIBRARY}"
+    INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}"
+    VERSION "${LUA_VERSION_STRING}"
+  )
+endif()
+

CMake/FindSDLTargets.cmake

@@ -0,0 +1,58 @@
+if(SDL_FOUND AND NOT TARGET SDL::SDL)
+  add_library(SDL::SDL INTERFACE IMPORTED)
+  set_target_properties(SDL::SDL PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SDL_INCLUDE_DIR}"
+    INTERFACE_LINK_LIBRARIES "${SDL_LIBRARY}"
+    # VERSION "${SDL_VERSION_STRING}"
+  )
+endif()
+
+if(SDL_GFX_FOUND AND NOT TARGET SDL::SDL_gfx)
+  add_library(SDL::SDL_gfx UNKNOWN IMPORTED)
+  set_target_properties(SDL::SDL_gfx PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SDL_GFX_INCLUDE_DIRS}"
+    IMPORTED_LOCATION "${SDL_GFX_LIBRARY}"
+    INTERFACE_LINK_LIBRARIES "${SDL_GFX_LIBRARIES}"
+    VERSION "${SDL_GFX_VERSION_STRING}"
+  )
+endif()
+
+if(SDL_MIXER_FOUND AND NOT TARGET SDL::SDL_mixer)
+  add_library(SDL::SDL_mixer UNKNOWN IMPORTED)
+  set_target_properties(SDL::SDL_mixer PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SDL_MIXER_INCLUDE_DIRS}"
+    IMPORTED_LOCATION "${SDL_MIXER_LIBRARY}"
+    INTERFACE_LINK_LIBRARIES "${SDL_MIXER_LIBRARIES}"
+    VERSION "${SDL_MIXER_VERSION_STRING}"
+  )
+endif()
+
+if(SDL_NET_FOUND AND NOT TARGET SDL::SDL_net)
+  add_library(SDL::SDL_net UNKNOWN IMPORTED)
+  set_target_properties(SDL::SDL_net PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SDL_NET_INCLUDE_DIRS}"
+    IMPORTED_LOCATION "${SDL_NET_LIBRARY}"
+    INTERFACE_LINK_LIBRARIES "${SDL_NET_LIBRARIES}"
+    VERSION "${SDL_NET_VERSION_STRING}"
+  )
+endif()
+
+if(SDL_SOUND_FOUND AND NOT TARGET SDL::SDL_sound)
+  add_library(SDL::SDL_sound UNKNOWN IMPORTED)
+  set_target_properties(SDL::SDL_sound PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SDL_SOUND_INCLUDE_DIRS}"
+    IMPORTED_LOCATION "${SDL_SOUND_LIBRARY}"
+    INTERFACE_LINK_LIBRARIES "${SDL_SOUND_LIBRARIES}"
+    VERSION "${SDL_SOUND_VERSION_STRING}"
+  )
+endif()
+
+if(SDL_TTF_FOUND AND NOT TARGET SDL::SDL_ttf)
+  add_library(SDL::SDL_ttf UNKNOWN IMPORTED)
+  set_target_properties(SDL::SDL_ttf PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SDL_TTF_INCLUDE_DIRS}"
+    IMPORTED_LOCATION "${SDL_TTF_LIBRARY}"
+    INTERFACE_LINK_LIBRARIES "${SDL_TTF_LIBRARIES}"
+    VERSION "${SDL_TTF_VERSION_STRING}"
+  )
+endif()