From 7d8919bf80442b2fe88735c8675b5f243c5272b9 Mon Sep 17 00:00:00 2001
From: Melody Horn <melody@boringcactus.com>
Date: Tue, 26 Feb 2019 23:34:54 -0700
Subject: dependency wrestling part 2

---
 .travis.yml              | 1 +
 scripts/setup_linux.sh   | 1 +
 scripts/setup_windows.sh | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9f1a763..e8d47a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ addons:
 before_install:
   - chmod +x scripts/setup_${TRAVIS_OS_NAME}.sh
   - . scripts/setup_${TRAVIS_OS_NAME}.sh
+  - set +x
 install:
   - which python3 && export PYTHON=python3 || export PYTHON=python
   - echo ${PYTHON}
diff --git a/scripts/setup_linux.sh b/scripts/setup_linux.sh
index 0458fe1..da62cf3 100644
--- a/scripts/setup_linux.sh
+++ b/scripts/setup_linux.sh
@@ -3,3 +3,4 @@ set -x
 
 sudo apt-get update
 sudo apt-get install -y python3.5 python3.5-dev python3-pip libgtk2.0-dev libgtk-3-dev libjpeg-dev libtiff-dev libsdl1.2-dev libgstreamer-plugins-base0.10-dev libnotify-dev freeglut3 freeglut3-dev libsm-dev libwebkitgtk-dev libwebkitgtk-3.0-dev
+python3 -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04/ wxPython==4.0.4
diff --git a/scripts/setup_windows.sh b/scripts/setup_windows.sh
index 1a69f98..75c700e 100644
--- a/scripts/setup_windows.sh
+++ b/scripts/setup_windows.sh
@@ -7,3 +7,5 @@ echo $PATH
 export PATH=/C/Python37:$PATH
 which python
 python get-pip.py
+curl https://download.lfd.uci.edu/pythonlibs/u2hcgva4/cx_Freeze-5.1.1-cp37-cp37m-win_amd64.whl -o cx_Freeze.whl
+python -m pip install cx_Freeze.whl
-- 
cgit v1.2.3