From 7dc22532e82f20031ae23511e3c8999739f671ff Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Fri, 23 Dec 2016 21:00:42 -0600
Subject: [PATCH] Add config.cmake file

---
 CMakeLists.txt           |  2 ++
 build/Makefile           | 12 +++++++-----
 config.cmake             |  2 ++
 src/ox/fs/CMakeLists.txt |  4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 config.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83a4f297d..05e09b053 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,4 +26,6 @@ enable_testing()
 
 include_directories("src")
 
+install(FILES config.cmake DESTINATION lib/ox)
+
 add_subdirectory(src)
diff --git a/build/Makefile b/build/Makefile
index b94c7d9be..00e7ef99f 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,26 +1,28 @@
 all: gba_build native_build native_debug_build windows_release windows_debug
 
+MAKE=make -j
+
 gba_build:
 	@if [ -d gba ]; then \
-		make -C gba ${ARGS}; \
+		${MAKE} -C gba ${ARGS}; \
 	fi
 
 native_build:
 	@if [ -d ${TARGET}-release ]; then \
-		make -C ${TARGET}-release ${ARGS}; \
+		${MAKE} -C ${TARGET}-release ${ARGS}; \
 	fi
 
 native_debug_build:
 	@if [ -d ${TARGET}-debug ]; then \
-		make -C ${TARGET}-debug ${ARGS}; \
+		${MAKE} -C ${TARGET}-debug ${ARGS}; \
 	fi
 
 windows_release:
 	@if [ -d windows-release ]; then \
-		make -C windows-release ${ARGS}; \
+		${MAKE} -C windows-release ${ARGS}; \
 	fi
 
 windows_debug:
 	@if [ -d windows-debug ]; then \
-		make -C windows-debug ${ARGS}; \
+		${MAKE} -C windows-debug ${ARGS}; \
 	fi
diff --git a/config.cmake b/config.cmake
new file mode 100644
index 000000000..6e211d652
--- /dev/null
+++ b/config.cmake
@@ -0,0 +1,2 @@
+set(Ox_INCLUDE_DIRS ${PREFIX}/include/ox)
+set(OxFs_LIBRARY ${PREFIX}/lib/ox/libOxFs.a)
diff --git a/src/ox/fs/CMakeLists.txt b/src/ox/fs/CMakeLists.txt
index 9c1b20913..3bd7a0117 100644
--- a/src/ox/fs/CMakeLists.txt
+++ b/src/ox/fs/CMakeLists.txt
@@ -24,8 +24,8 @@ install(
 )
 
 install(TARGETS OxFS
-        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib/ox
+        ARCHIVE DESTINATION lib/ox
 )
 
 if(OX_BUILD_EXEC STREQUAL "ON")