From ac4d1390305117a8cf93eb45f620375cbe4d9c06 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Mon, 17 Aug 2015 11:46:04 -1000
Subject: [PATCH] made independent from RetroCommon and AngelScript

---
 hecl/.gitmodules           |  6 ------
 hecl/CMakeLists.txt        | 11 ++++++++---
 hecl/extern/AngelScript    |  1 -
 hecl/extern/CMakeLists.txt |  2 --
 hecl/extern/RetroCommon    |  1 -
 5 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 160000 hecl/extern/AngelScript
 delete mode 160000 hecl/extern/RetroCommon

diff --git a/hecl/.gitmodules b/hecl/.gitmodules
index bf48c3af1..46eade2fa 100644
--- a/hecl/.gitmodules
+++ b/hecl/.gitmodules
@@ -1,15 +1,9 @@
 [submodule "extern/Athena"]
 	path = extern/Athena
 	url = https://github.com/Antidote/Athena.git
-[submodule "extern/RetroCommon"]
-	path = extern/RetroCommon
-	url = https://github.com/RetroView/RetroCommon.git
 [submodule "extern/libSquish"]
 	path = extern/libSquish
 	url = https://github.com/jackoalan/libSquish.git
 [submodule "extern/LogVisor"]
 	path = extern/LogVisor
 	url = https://github.com/RetroView/LogVisor.git
-[submodule "extern/AngelScript"]
-	path = extern/AngelScript
-	url = https://github.com/RetroView/AngelScript.git
diff --git a/hecl/CMakeLists.txt b/hecl/CMakeLists.txt
index 9c89f5e91..774a5c49b 100644
--- a/hecl/CMakeLists.txt
+++ b/hecl/CMakeLists.txt
@@ -1,3 +1,4 @@
+if(NOT HECL_SUBPORJECT)
 cmake_minimum_required(VERSION 3.0)
 project(hecl)
 if(MSVC)
@@ -6,15 +7,19 @@ if(MSVC)
 else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-multichar -fno-exceptions")
 endif()
+endif()
+
 list(APPEND HECL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/blender)
+set(HECL_INCLUDE_DIR ${HECL_INCLUDE_DIR} PARENT_SCOPE)
 set(ATHENA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/Athena/include)
+set(ATHENA_INCLUDE_DIR ${ATHENA_INCLUDE_DIR} PARENT_SCOPE)
 set(LOG_VISOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/LogVisor/include)
-set(ANGELSCRIPT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/AngelScript/angelscript/include)
+set(LOG_VISOR_INCLUDE_DIR ${LOG_VISOR_INCLUDE_DIR} PARENT_SCOPE)
 set(SQUISH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/libSquish)
-add_definitions(-DAS_USE_NAMESPACE=1 -DAS_NO_EXCEPTIONS=1)
+set(SQUISH_INCLUDE_DIR ${SQUISH_INCLUDE_DIR} PARENT_SCOPE)
 add_subdirectory(bintoc)
 add_subdirectory(extern)
-include_directories(include ${LOG_VISOR_INCLUDE_DIR} ${ATHENA_INCLUDE_DIR} ${ANGELSCRIPT_INCLUDE_DIR})
+include_directories(include ${LOG_VISOR_INCLUDE_DIR} ${ATHENA_INCLUDE_DIR})
 add_subdirectory(lib)
 add_subdirectory(blender)
 add_subdirectory(driver)
diff --git a/hecl/extern/AngelScript b/hecl/extern/AngelScript
deleted file mode 160000
index 0a8e531a6..000000000
--- a/hecl/extern/AngelScript
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0a8e531a63fad935ca3ce68e2122715320417668
diff --git a/hecl/extern/CMakeLists.txt b/hecl/extern/CMakeLists.txt
index 7299e3d51..40b9d24b2 100644
--- a/hecl/extern/CMakeLists.txt
+++ b/hecl/extern/CMakeLists.txt
@@ -2,6 +2,4 @@ add_subdirectory(libpng)
 add_subdirectory(libSquish)
 add_subdirectory(blowfish)
 add_subdirectory(LogVisor)
-add_subdirectory(AngelScript)
 add_subdirectory(Athena EXCLUDE_FROM_ALL)
-add_subdirectory(RetroCommon EXCLUDE_FROM_ALL)
diff --git a/hecl/extern/RetroCommon b/hecl/extern/RetroCommon
deleted file mode 160000
index 53256dea1..000000000
--- a/hecl/extern/RetroCommon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 53256dea15ba37595b2958ed49249ddf370071ba