From 6e1bec1dd03f27e51a6398745ff293f187ea8bac Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Sat, 24 Dec 2016 00:41:57 -0600
Subject: [PATCH] Add Ox to project

---
 Makefile           | 6 ++++--
 src/CMakeLists.txt | 3 +++
 src/core/core.cpp  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index bc536b0e..8c0fe6e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 OS=$(shell uname | tr [:upper:] [:lower:])
 HOST_ENV=${OS}-$(shell uname -m)
 DEVENV=devenv$(shell pwd | sed 's/\//-/g')
+DEVENV_IMAGE=wombatant/devenv
 ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
 	ENV_RUN=docker exec --user $(shell id -u ${USER}) ${DEVENV}
 endif
@@ -24,10 +25,11 @@ gdb: make
 	gdb ./build/current/src/wombat/wombat
 
 devenv:
-	docker pull wombatant/devenv
+	docker pull ${DEVENV_IMAGE}
 	docker run -d -v $(shell pwd):/usr/src/project \
 		-e LOCAL_USER_ID=$(shell id -u ${USER}) \
-		--name ${DEVENV} -t wombatant/devenv bash
+		--restart=always --name ${DEVENV} \
+		-t ${DEVENV_IMAGE} bash
 devenv-destroy:
 	docker rm -f ${DEVENV}
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b754e49e..0f5feccd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,9 @@ if(WOMBAT_BUILD_TYPE STREQUAL "Native")
 elseif(WOMBAT_BUILD_TYPE STREQUAL "GBA")
 endif()
 
+find_package(Ox REQUIRED)
+include_directories(${Ox_INCLUDE_DIRS})
+set(LIBS ${LIBS} ${Ox_LIBRARY})
 
 #project packages
 
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 5d567917..515f6023 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -5,8 +5,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+#include <ox/std/types.hpp>
 #include "gfx.hpp"
-#include "types.hpp"
 
 namespace nostalgia {
 namespace core {