From 65b8dd559c938ee470e7c275196c9284d5852151 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Wed, 19 Sep 2018 23:05:46 -0400
Subject: [PATCH] MP libopenmpt: Remove from Linux buildbots due to explicit
 OPENMPT=1 change

---
 .circleci/config.yml |  4 ++--
 .travis.yml          | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1f884e188..a54404d11 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,13 +44,13 @@ jobs:
       - checkout
       - run:
           name: Clean build
-          command: make -C src LINUX=1 NOOPENMPT=1 clean
+          command: make -C src LINUX=1 clean
       - restore_cache:
           keys:
             - v1-SRB2-{{ .Branch }}-{{ checksum "objs/Linux/SDL/Release/depend.dep" }}
       - run:
           name: Compile
-          command: make -C src LINUX=1 ERRORMODE=1 NOOPENMPT=1 -k
+          command: make -C src LINUX=1 ERRORMODE=1 -k
       - store_artifacts:
           path: /root/SRB2/bin/Linux/Release/
           destination: bin
diff --git a/.travis.yml b/.travis.yml
index 736042bbb..a9f4ddfb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-              - libopenmpt-dev
               - p7zip-full
               - gcc-4.4
           compiler: gcc-4.4
@@ -25,7 +24,6 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-              - libopenmpt-dev
               - p7zip-full
               - gcc-4.6
           compiler: gcc-4.6
@@ -38,7 +36,6 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-              - libopenmpt-dev
               - p7zip-full
               - gcc-4.7
           compiler: gcc-4.7
@@ -56,7 +53,6 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-              - libopenmpt-dev
               - p7zip-full
               - gcc-4.8
           compiler: gcc-4.8
@@ -71,7 +67,6 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-              - libopenmpt-dev
               - p7zip-full
               - gcc-7
           compiler: gcc-7
@@ -90,7 +85,6 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-              - libopenmpt-dev
               - p7zip-full
               - clang-3.5
           compiler: clang-3.5
@@ -106,7 +100,6 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-              - libopenmpt-dev
               - p7zip-full
               - clang-3.6
           compiler: clang-3.6
@@ -122,7 +115,6 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-              - libopenmpt-dev
               - p7zip-full
               - clang-3.7
           compiler: clang-3.7
@@ -138,7 +130,6 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-              - libopenmpt-dev
               - p7zip-full
               - clang-3.8
           compiler: clang-3.8
@@ -154,7 +145,6 @@ matrix:
               - libpng-dev
               - libgl1-mesa-dev
               - libgme-dev
-              - libopenmpt-dev
               - p7zip-full
               - clang-3.9
           compiler: clang-3.9
@@ -170,7 +160,6 @@ matrix:
 #              - libpng-dev
 #              - libgl1-mesa-dev
 #              - libgme-dev
-#              - libopenmpt-dev
 #              - p7zip-full
 #              - clang-4.0
 #          compiler: clang-4.0
@@ -186,7 +175,6 @@ matrix:
 #              - libpng-dev
 #              - libgl1-mesa-dev
 #              - libgme-dev
-#              - libopenmpt-dev
 #              - p7zip-full
 #              - clang-5.0
 #          compiler: clang-5.0
@@ -238,7 +226,6 @@ addons:
     - libpng-dev
     - libgl1-mesa-dev
     - libgme-dev
-    - libopenmpt-dev
     - p7zip-full
 
 before_script: