From df76f9eb2c3e9881f89429b49e32fb1b401a1030 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Fri, 21 Apr 2017 06:12:17 -0500
Subject: [PATCH] Upgrade Ox

---
 Dockerfile | 21 +++++++++++++--------
 Makefile   |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 282abef7..abdc7eee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,26 +8,31 @@ RUN dnf install -y qt5-devel llvm libasan
 ###############################################################################
 # Install Ox
 
-RUN git clone -b release-0.2 https://github.com/wombatant/ox.git /usr/local/src/ox && \
+RUN git clone https://github.com/wombatant/ox.git /usr/local/src/ox && \
     cd /usr/local/src/ox && \
+	 git checkout -b install 7bce077ea81d7dbe10f7ba33eec0e061453f3f12
+
 	 # setup build dirs
-    mkdir -p \
+RUN mkdir -p \
              /usr/local/src/ox/build/release \
              /usr/local/src/ox/build/windows \
-             /usr/local/src/ox/build/gba; \
+             /usr/local/src/ox/build/gba;
+
     # install Ox for native environment
-    cd /usr/local/src/ox/build/release && \
+RUN cd /usr/local/src/ox/build/release && \
     cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ../../ && \
-    make -j install; \
+    make -j install
+
     # install Ox for GBA
-    cd /usr/local/src/ox/build/gba && \
+RUN cd /usr/local/src/ox/build/gba && \
     cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
           -DCMAKE_TOOLCHAIN_FILE=cmake/Modules/GBA.cmake \
           -DCMAKE_INSTALL_PREFIX=/opt/devkitPro/devkitARM \
           -DOX_USE_STDLIB=OFF ../../ && \
-    make -j install; \
+    make -j install
+
     # install Ox for Windows
-    cd /usr/local/src/ox/build/windows && \
+RUN cd /usr/local/src/ox/build/windows && \
     cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
           -DCMAKE_TOOLCHAIN_FILE=cmake/Modules/Mingw.cmake \
           -DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32 \
diff --git a/Makefile b/Makefile
index 37bf3edf..e0c20f6e 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ gdb: make
 	gdb ./build/current/src/wombat/wombat
 
 devenv-build:
-	docker build --no-cache . -t ${DEVENV_IMAGE}
+	docker build . -t ${DEVENV_IMAGE}
 devenv:
 	docker run -d \
 		-e LOCAL_USER_ID=$(shell id -u ${USER}) \