From 7bf5d36b8ec1697670269dbc9feb718a0eea63fa Mon Sep 17 00:00:00 2001
From: Kalamatee <kalamatee@gmail.com>
Date: Sat, 20 Jun 2015 20:30:46 +0100
Subject: [PATCH] import AROS changes

---
 neo/CMakeLists.txt        | 2 +-
 neo/framework/Licensee.h  | 1 +
 neo/renderer/Model_ma.cpp | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt
index 7a6cc5bc..afa4a570 100644
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
@@ -281,7 +281,7 @@ endif()
 
 set(bindir		"${CMAKE_INSTALL_FULL_BINDIR}")
 set(libdir		"${CMAKE_INSTALL_FULL_LIBDIR}/dhewm3")
-set(datadir		"${CMAKE_INSTALL_FULL_DATADIR}/dhewm3")
+set(datadir	"${CMAKE_INSTALL_FULL_DATADIR}/dhewm3")
 
 configure_file(
 	"${CMAKE_SOURCE_DIR}/config.h.in"
diff --git a/neo/framework/Licensee.h b/neo/framework/Licensee.h
index 45b19b5a..b002868f 100644
--- a/neo/framework/Licensee.h
+++ b/neo/framework/Licensee.h
@@ -43,6 +43,7 @@ If you have questions concerning this license or the applicable additional terms
 
 #define ENGINE_VERSION					"dhewm 3 1.4.1"	// printed in console
 #endif
+#endif
 
 // paths
 #define	BASE_GAMEDIR					"base"
diff --git a/neo/renderer/Model_ma.cpp b/neo/renderer/Model_ma.cpp
index 1cd672af..87050c6d 100644
--- a/neo/renderer/Model_ma.cpp
+++ b/neo/renderer/Model_ma.cpp
@@ -1030,7 +1030,6 @@ maModel_t *MA_Load( const char *fileName ) {
 		}
 		ma = NULL;
 	}
-
 	fileSystem->FreeFile( buf );
 
 	return ma;