Merge the two different libs together into the same library.

CInterface/Battling/Battle.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Models/Battle.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export uint8_t CreatureLib_Battle_Construct(Battle*& out, const BattleLibrary* library, BattleParty* partyArr[],

CInterface/Battling/BattleLibrary.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Library/BattleLibrary.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export uint8_t CreatureLib_BattleLibrary_Construct(const BattleLibrary*& out,

CInterface/Battling/BattleParty.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Models/BattleParty.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 // Note that creatureIndices should be twice the size of numberOfIndices, and have index of side, index of creature on

CInterface/Battling/BattleRandom.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Models/BattleRandom.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export BattleRandom* CreatureLib_BattleRandom_Construct() { return new BattleRandom(); }

CInterface/Battling/BattleSide.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Models/BattleSide.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export BattleSide* CreatureLib_BattleSide_Construct(uint8_t index, Battle* battle, uint8_t creaturesPerSide) {

CInterface/Battling/BattleStatCalculator.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Library/BattleStatCalculator.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export const BattleStatCalculator* CreatureLib_BattleStatCalculator_Construct() { return new BattleStatCalculator(); }

CInterface/Battling/Core.hpp

@@ -1,41 +0,0 @@
-#ifndef CREATURELIB_CORE_HPP
-#define CREATURELIB_CORE_HPP
-
-#include <cstring>
-#include <exception>
-#include <sstream>
-#include <string>
-#define export extern "C" [[maybe_unused]]
-
-#define CreatureLibBattlingException 3;
-#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
-
-class ExceptionHandler {
-    static std::string _creatureLibLastException;
-
-public:
-    static void SetLastException(std::string function, const std::exception& e) {
-        std::stringstream ss;
-        ss << "[" << function << "] " << e.what();
-        _creatureLibLastException = ss.str();
-    }
-    static const char* GetLastException() { return _creatureLibLastException.c_str(); }
-};
-
-#define Try(data)                                                                                                      \
-    try {                                                                                                              \
-        data;                                                                                                          \
-        return 0;                                                                                                      \
-    } catch (const std::exception& e) {                                                                                \
-        ExceptionHandler::SetLastException(__FUNCTION__, e);                                                           \
-        return CreatureLibBattlingException;                                                                           \
-    }
-
-#define SIMPLE_GET_FUNC(type, name, returnType)                                                                        \
-    export returnType CreatureLib_##type##_##name(const type* p) { return p->name(); }
-#define BORROWED_GET_FUNC(type, name, returnType)                                                                      \
-    export returnType CreatureLib_##type##_##name(const type* p) { return p->name().GetRaw(); }
-#define SMART_GET_FUNC(type, name, returnType)                                                                         \
-    export returnType CreatureLib_##type##_##name(const type* p) { return p->name().get(); }
-
-#endif // CREATURELIB_CORE_HPP

CInterface/Battling/Creature.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Models/Creature.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export uint8_t CreatureLib_Creature_Construct(Creature*& out, const BattleLibrary* library,

CInterface/Battling/CreatureParty.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Models/CreatureParty.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export CreatureParty* CreatureLib_CreatureParty_ConstructWithSize(size_t size) { return new CreatureParty(size); }

CInterface/Battling/DamageLibrary.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Library/DamageLibrary.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export const DamageLibrary* CreatureLib_DamageLibrary_Construct() { return new DamageLibrary(); }

CInterface/Battling/EventData.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/EventHooks/EventData.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export void CreatureLib_EventData_Destruct(const EventData* p) { delete p; }

CInterface/Battling/ExecutingAttack.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Models/ExecutingAttack.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export uint8_t CreatureLib_ExecutingAttack_Construct(ExecutingAttack*& out, Creature* const* targets,

CInterface/Battling/ExperienceLibrary.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Library/ExperienceLibrary.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export const ExperienceLibrary* CreatureLib_ExperienceLibrary_Construct() { return new ExperienceLibrary(); }

CInterface/Battling/LearnedAttack.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Models/LearnedAttack.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export uint8_t CreatureLib_LearnedAttack_Construct(LearnedAttack*& out, const CreatureLib::Library::AttackData* attack,

CInterface/Battling/MiscLibrary.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/Library/MiscLibrary.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export MiscLibrary* CreatureLib_MiscLibrary_Construct() { return new MiscLibrary(); }

CInterface/Battling/Script.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/ScriptHandling/Script.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export void CreatureLib_Script_Destruct(Script* p) { delete p; }

CInterface/Battling/ScriptResolver.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Battling/ScriptHandling/ScriptResolver.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export ScriptResolver* CreatureLib_ScriptResolver_Construct() { return new ScriptResolver(); }

CInterface/Battling/TurnChoices.cpp

@@ -2,7 +2,7 @@
 #include "../../src/Battling/TurnChoices/FleeTurnChoice.hpp"
 #include "../../src/Battling/TurnChoices/PassTurnChoice.hpp"
 #include "../../src/Battling/TurnChoices/SwitchTurnChoice.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Battling;
 
 export AttackTurnChoice* CreatureLib_AttackTurnChoice_Construct(Creature* user, LearnedAttack* attack,

CInterface/Core.hpp

@@ -7,7 +7,7 @@
 #include <string>
 #define export extern "C" [[maybe_unused]]
 
-#define CreatureLibLibraryException 2;
+#define CreatureLibException 2;
 #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
 
 class ExceptionHandler {
@@ -28,7 +28,7 @@ public:
         return 0;                                                                                                      \
     } catch (const std::exception& e) {                                                                                \
         ExceptionHandler::SetLastException(__FUNCTION__, e);                                                           \
-        return CreatureLibLibraryException;                                                                            \
+        return CreatureLibException;                                                                                   \
     }
 
 #define SIMPLE_GET_FUNC(type, name, returnType)                                                                        \

CInterface/Library/AttackData.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Library/Attacks/AttackData.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Library;
 
 export uint8_t CreatureLib_AttackData_Construct(AttackData*& out, const char* name, uint8_t type,

CInterface/Library/AttackLibrary.cpp

@@ -1,6 +1,6 @@
 #include "../../src/Library/AttackLibrary.hpp"
+#include "../Core.hpp"
 #include "BaseLibrary.cpp"
-#include "Core.hpp"
 
 using namespace CreatureLib::Library;
 

CInterface/Library/BaseLibrary.cpp

@@ -1,4 +1,4 @@
-#include "Core.hpp"
+#include "../Core.hpp"
 
 #define BASELIBRARY(simpleName, fullname, returnType)                                                                  \
     export uint8_t simpleName##_Insert(fullname* p, const char* name, returnType* t) {                                 \

CInterface/Library/Core.cpp

@@ -1,5 +0,0 @@
-#include "Core.hpp"
-
-std::string ExceptionHandler::_creatureLibLastException = "";
-
-export const char* CreatureLib_C_GetLastException() { return ExceptionHandler::GetLastException(); }

CInterface/Library/CreatureSpecies.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Library/CreatureData/CreatureSpecies.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Library;
 
 export uint8_t CreatureLib_CreatureSpecies_Construct(CreatureSpecies*& out, uint16_t id, const char* name,

CInterface/Library/DataLibrary.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Library/DataLibrary.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Library;
 
 export uint8_t CreatureLib_DataLibrary_Construct(const DataLibrary*& out, LibrarySettings* settings,

CInterface/Library/EffectParameter.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Library/EffectParameter.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Library;
 
 export EffectParameter* CreatureLib_EffectParameter_FromBool(bool b) { return new EffectParameter(b); }

CInterface/Library/GrowthRate.cpp

@@ -1,7 +1,7 @@
 #include "../../src/Library/GrowthRates/GrowthRate.hpp"
 #include "../../src/Library/GrowthRates/ExternGrowthRate.hpp"
 #include "../../src/Library/GrowthRates/LookupGrowthRate.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Library;
 
 export GrowthRate* CreatureLib_LookupGrowthRate_Construct(uint32_t experiencePerLevel[], size_t count) {

CInterface/Library/GrowthRateLibrary.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Library/GrowthRates/GrowthRateLibrary.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Library;
 
 export GrowthRateLibrary* CreatureLib_GrowthRateLibrary_Construct(size_t initialCapacity) {

CInterface/Library/Item.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Library/Items/Item.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Library;
 
 export Item* CreatureLib_Item_Construct(const char* name, ItemCategory category, BattleItemCategory battleCategory,

CInterface/Library/ItemLibrary.cpp

@@ -1,6 +1,6 @@
 #include "../../src/Library/ItemLibrary.hpp"
+#include "../Core.hpp"
 #include "BaseLibrary.cpp"
-#include "Core.hpp"
 using namespace CreatureLib::Library;
 
 export const ItemLibrary* CreatureLib_ItemLibrary_Construct(size_t initialCapacity = 32) {

CInterface/Library/LearnableAttacks.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Library/CreatureData/LearnableAttacks.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Library;
 
 export uint8_t CreatureLib_LearnableAttacks_Construct(LearnableAttacks*& out, size_t levelAttackCapacity) {

CInterface/Library/LibrarySettings.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Library/LibrarySettings.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Library;
 
 export const LibrarySettings* CreatureLib_LibrarySettings_Construct(uint8_t maximalLevel, uint8_t maximalMoves) {

CInterface/Library/SpeciesLibrary.cpp

@@ -1,6 +1,6 @@
 #include "../../src/Library/SpeciesLibrary.hpp"
+#include "../Core.hpp"
 #include "BaseLibrary.cpp"
-#include "Core.hpp"
 using namespace CreatureLib::Library;
 
 export const SpeciesLibrary* CreatureLib_SpeciesLibrary_Construct(size_t initialCapacity = 32) {

CInterface/Library/SpeciesVariant.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Library/CreatureData/SpeciesVariant.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 
 using namespace CreatureLib::Library;
 

CInterface/Library/TypeLibrary.cpp

@@ -1,5 +1,5 @@
 #include "../../src/Library/TypeLibrary.hpp"
-#include "Core.hpp"
+#include "../Core.hpp"
 using namespace CreatureLib::Library;
 
 export TypeLibrary* CreatureLib_TypeLibrary_Construct(size_t initialCapacity) {

CMakeLists.txt

@@ -20,13 +20,9 @@ if (SHARED)
     set(LIBTYPE SHARED)
 endif (SHARED)
 
-# Create main Library library with files in src/Library
-file(GLOB_RECURSE LIBRARY_SRC_FILES "src/Library/*.cpp" "src/Library/*.hpp" "CInterface/Library/*.cpp" "CInterface/Library/*.hpp")
-add_library(CreatureLibLibrary SHARED ${LIBRARY_SRC_FILES})
-
-# Create Battling library with files in src/Battling
-file(GLOB_RECURSE BATTLING_SRC_FILES "src/Battling/*.cpp" "src/Battling/*.hpp" "CInterface/Battling/*.cpp" "CInterface/Battling/*.hpp")
-add_library(CreatureLibBattling SHARED ${BATTLING_SRC_FILES})
+file(GLOB_RECURSE LIBRARY_SRC_FILES
+        "src/*.cpp" "src/*.hpp" "CInterface/*.cpp" "CInterface/*.hpp")
+add_library(CreatureLib SHARED ${LIBRARY_SRC_FILES})
 
 # If we are building for Windows we need to set some specific variables.
 if (WINDOWS)
@@ -40,25 +36,21 @@ endif (WINDOWS)
 
 # Set up links to all relevant libraries.
 SET(_LIBRARYLINKS Arbutils)
-SET(_BATTLINGLINKS CreatureLibLibrary Arbutils)
 
 # If we need to link the C libraries statically, do so.
 if (STATICC)
     message(STATUS "Linking C statically.")
     SET(_LIBRARYLINKS ${_LIBRARYLINKS} -static-libgcc -static-libstdc++)
-    SET(_BATTLINGLINKS ${_BATTLINGLINKS} -static-libgcc -static-libstdc++)
 endif ()
 
 # And link the libraries together
-target_link_libraries(CreatureLibLibrary PUBLIC ${_LIBRARYLINKS})
-target_link_libraries(CreatureLibBattling PUBLIC ${_BATTLINGLINKS})
-target_compile_definitions(CreatureLibBattling PRIVATE BATTLING)
+target_link_libraries(CreatureLib PUBLIC ${_LIBRARYLINKS})
 
 if (TESTS)
     # Create Test executable
     file(GLOB_RECURSE TEST_FILES "tests/*.cpp" "tests/*.hpp")
     add_executable(CreatureLibTests ${TEST_FILES} extern/catch.hpp)
-    target_link_libraries(CreatureLibTests PUBLIC CreatureLibLibrary CreatureLibBattling Arbutils)
+    target_link_libraries(CreatureLibTests PUBLIC CreatureLib Arbutils)
 
     # Add a definition for the test library
     target_compile_definitions(CreatureLibTests PRIVATE TESTS_BUILD)