From 175fc37be970fc0843e55ef453f8d80f40a9c7fd Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Fri, 5 Nov 2021 14:04:17 +0100
Subject: [PATCH] Update to work for latest builds.

---
 CInterface/Core.hpp   | 2 ++
 CMakeLists.txt        | 5 ++---
 CMakeLists.txt.in     | 7 ++++---
 src/DepthSearchAI.hpp | 1 +
 test_runner/BuildData | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CInterface/Core.hpp b/CInterface/Core.hpp
index 4a31146..e600169 100644
--- a/CInterface/Core.hpp
+++ b/CInterface/Core.hpp
@@ -1,8 +1,10 @@
 #ifndef PKMNLIB_AI_CORE_HPP
 #define PKMNLIB_AI_CORE_HPP
 
+#include <Arbutils/Exception.hpp>
 #include <cstring>
 #include <exception>
+#include <sstream>
 #include <string>
 #define export extern "C" [[maybe_unused]]
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0b70d4..ae9ce94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,6 @@ include_pkmnlib()
 
 file(GLOB_RECURSE SRC_FILES src/*.cpp src/*.hpp CInterface/pkmnlibai.cpp CInterface/Core.cpp)
 add_library(pkmnlib_ai SHARED ${SRC_FILES})
-target_precompile_headers(pkmnlib_ai PUBLIC src/Precompiled.hxx)
 set_target_properties(pkmnlib_ai PROPERTIES LINKER_LANGUAGE CXX)
 add_definitions(-DLEVEL_U8)
 
@@ -31,7 +30,7 @@ if (WINDOWS)
 endif (WINDOWS)
 
 
-SET(_LINKS Arbutils CreatureLib pkmnLib -lpthread)
+SET(_LINKS Arbutils CreatureLib pkmnLib angelscript -lpthread)
 target_link_libraries(pkmnlib_ai PUBLIC ${_LINKS})
 target_compile_options(pkmnlib_ai PRIVATE -Wall -Wextra -Werror)
 
@@ -40,5 +39,5 @@ if (AIRUNNER)
     file(GLOB_RECURSE RUNNER_SRC_FILES test_runner/*.cpp test_runner/*.hpp)
     add_executable(pkmnlib_ai_runner ${RUNNER_SRC_FILES})
     target_compile_options(pkmnlib_ai_runner PRIVATE -Wall -Wextra -Werror)
-    target_link_libraries(pkmnlib_ai_runner PUBLIC pkmnlib_ai -lpthread)
+    target_link_libraries(pkmnlib_ai_runner PUBLIC pkmnlib_ai ${_LINKS})
 endif()
\ No newline at end of file
diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in
index 40bcf32..17aa301 100644
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -42,9 +42,10 @@ function(include_pkmnlib)
             ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include/PkmnLib)
 
     include_directories(${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include
-                        ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/include
-                        ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/Angelscript/src/AngelscriptProj/angelscript/include
-                        ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/bin/Arbutils/include)
+            ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/src/pkmnlib/extern/AngelscriptDebuggerServer/extern/asio-1.18.2/include
+            ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/include
+            ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/Angelscript/src/AngelscriptProj/angelscript/include
+            ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/bin/Arbutils/include)
 
 
 endfunction()
\ No newline at end of file
diff --git a/src/DepthSearchAI.hpp b/src/DepthSearchAI.hpp
index 235014d..1469008 100644
--- a/src/DepthSearchAI.hpp
+++ b/src/DepthSearchAI.hpp
@@ -171,6 +171,7 @@ namespace PkmnLibAI {
                 case CreatureLib::Library::AttackTarget::RandomOpponent: return GetOppositeIndex(user);
                 case CreatureLib::Library::AttackTarget::Self: return user->GetBattleIndex();
             }
+            return {};
         }
 
         SimulatedResult SimulateTurn(PkmnLib::Battling::Battle* originalBattle, u8 sideIndex, u8 pokemonIndex, u8 index,
diff --git a/test_runner/BuildData b/test_runner/BuildData
index e69eaca..d3e95da 160000
--- a/test_runner/BuildData
+++ b/test_runner/BuildData
@@ -1 +1 @@
-Subproject commit e69eacaa9bd65ab2d6f1c42749f5a0734423f3c9
+Subproject commit d3e95dad61c5ce60db17db905fec4eeb4f65fdce