From c4e8a82df1e4be178e0ae960ea93923e322e2985 Mon Sep 17 00:00:00 2001
From: GokuWeedLord <adam@notadam.me>
Date: Sun, 10 Dec 2017 02:49:22 +1100
Subject: [PATCH] building finally works :sweat_drops: :sweat_drops:
 :sweat_drops:

---
 CMakeLists.txt                                   |  1 -
 scripts/native/CMakeLists.txt                    |  9 +++++++--
 scripts/native/ScriptObject.h                    |  7 ++++---
 scripts/native/statuseffect/StatusEffect50.cpp   | 16 +++++++++-------
 src/servers/Server_Zone/CMakeLists.txt           |  1 -
 src/servers/Server_Zone/Script/NativeScriptApi.h |  6 +++---
 src/servers/Server_Zone/Script/ScriptManager.cpp | 16 +++++++---------
 src/servers/Server_Zone/Script/ScriptManager.h   |  2 --
 8 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f7b96f6..45c443c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,6 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/servers/Server_Common/Version.cp
 
 ##########################################################################
 # Common include folders
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/ChaiScript-6.0.0/include/")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/datReader/")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/mysqlConnector/")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src")
diff --git a/scripts/native/CMakeLists.txt b/scripts/native/CMakeLists.txt
index f431f0eb..3637a8a6 100644
--- a/scripts/native/CMakeLists.txt
+++ b/scripts/native/CMakeLists.txt
@@ -1,14 +1,19 @@
+cmake_minimum_required(VERSION 2.6)
 project(Sapphire_Script)
 
 file(GLOB SCRIPT_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-
 file(GLOB_RECURSE SCRIPT_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
+
+include_directories("../../src/servers/")
+include_directories("../../src/servers/Server_Zone/")
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/compiledscripts/")
+
 foreach(_sourcefile "${SCRIPT_FILES}")
     get_filename_component(_file "${_sourcefile}" NAME_WE)
     add_library("${_file}" MODULE "${_sourcefile}" "${SCRIPT_INCLUDE_FILES}")
 
     add_dependencies("${_file}" server_zone)
-    target_link_libraries("${_file}" server_zone)
 
     set_target_properties("${_file}" PROPERTIES
             CXX_STANDARD 14
diff --git a/scripts/native/ScriptObject.h b/scripts/native/ScriptObject.h
index 8d639251..108b8df0 100644
--- a/scripts/native/ScriptObject.h
+++ b/scripts/native/ScriptObject.h
@@ -1,9 +1,10 @@
 #ifndef SAPPHIRE_SCRIPTOBJECT_H
 #define SAPPHIRE_SCRIPTOBJECT_H
 
-#include <Server_Zone/Script/NativeScriptApi.h>
-#include <Server_Zone/Actor/Actor.h>
-#include <Server_Zone/Actor/Player.h>
+#include <Script/NativeScriptApi.h>
+#include <Forwards.h>
+#include <Actor/Actor.h>
+#include <Actor/Player.h>
 
 
 #endif //SAPPHIRE_SCRIPTOBJECT_H
diff --git a/scripts/native/statuseffect/StatusEffect50.cpp b/scripts/native/statuseffect/StatusEffect50.cpp
index e03a20d5..b0fe2a1f 100644
--- a/scripts/native/statuseffect/StatusEffect50.cpp
+++ b/scripts/native/statuseffect/StatusEffect50.cpp
@@ -1,15 +1,17 @@
-#include <scripts/native/ScriptObject.h>
+#include "../ScriptObject.h"
 
 class StatusEffect50 : StatusEffectScript
 {
 public:
-    StatusEffect50() : StatusEffectScript( "StatusEffect50", 50 )
-    {}
+   StatusEffect50() : StatusEffectScript( "StatusEffect50", 50 )
+   {}
 
-    virtual void onTick( Core::Entity::ActorPtr actor )
-    {
+   virtual void onTick( Core::Entity::ActorPtr actor )
+   {
 
-    }
+   }
 };
 
-EXPORT_STATUSEFFECTSCRIPT( StatusEffect50 )
\ No newline at end of file
+//extern "C" __declspec( dllexport ) __cdecl StatusEffectScript* getStatusEffectScript() { return static_cast< StatusEffectScript* >( new StatusEffect50 ); }
+
+//EXPORT_STATUSEFFECTSCRIPT( StatusEffect50 )
\ No newline at end of file
diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/Server_Zone/CMakeLists.txt
index 60dc0ef4..308f3ab7 100644
--- a/src/servers/Server_Zone/CMakeLists.txt
+++ b/src/servers/Server_Zone/CMakeLists.txt
@@ -46,7 +46,6 @@ set_target_properties(server_zone PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
-    ENABLE_EXPORTS ON
     RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
     RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
     RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
diff --git a/src/servers/Server_Zone/Script/NativeScriptApi.h b/src/servers/Server_Zone/Script/NativeScriptApi.h
index 6d71c1e8..d53524b0 100644
--- a/src/servers/Server_Zone/Script/NativeScriptApi.h
+++ b/src/servers/Server_Zone/Script/NativeScriptApi.h
@@ -2,9 +2,9 @@
 #define NATIVE_SCRIPT_API
 
 #include <string>
-#include <Server_Zone/Actor/Actor.h>
-#include <Server_Zone/Actor/Player.h>
-#include <Server_Zone/StatusEffect/StatusEffect.h>
+#include <Actor/Actor.h>
+#include <Actor/Player.h>
+#include <StatusEffect/StatusEffect.h>
 
 #define EXPORT_SCRIPTOBJECT( type, base ) \
 extern "C" __declspec( dllexport ) __cdecl base* get##base() \
diff --git a/src/servers/Server_Zone/Script/ScriptManager.cpp b/src/servers/Server_Zone/Script/ScriptManager.cpp
index 316ddf63..0f66c00e 100644
--- a/src/servers/Server_Zone/Script/ScriptManager.cpp
+++ b/src/servers/Server_Zone/Script/ScriptManager.cpp
@@ -1,6 +1,5 @@
 #include <Server_Common/Logging/Logger.h>
 #include <Server_Common/Exd/ExdData.h>
-#include <chaiscript/chaiscript.hpp>
 
 #include "NativeScript.h"
 
@@ -44,14 +43,13 @@ void Core::Scripting::ScriptManager::loadDir( std::string dirname, std::set<std:
    boost::filesystem::recursive_directory_iterator iter( targetDir ), eod;
 
    BOOST_FOREACH( boost::filesystem::path const& i, make_pair( iter, eod ) )
-            {
-
-               if( is_regular_file( i ) && boost::filesystem::extension( i.string() ) == ".chai" ||
-                   boost::filesystem::extension( i.string() ) == ".inc" )
-               {
-                  chaiFiles.insert( i.string() );
-               }
-            }
+   {
+      if( is_regular_file( i ) && boost::filesystem::extension( i.string() ) == ".chai" ||
+          boost::filesystem::extension( i.string() ) == ".inc" )
+      {
+         chaiFiles.insert( i.string() );
+      }
+   }
 
 }
 
diff --git a/src/servers/Server_Zone/Script/ScriptManager.h b/src/servers/Server_Zone/Script/ScriptManager.h
index 2695e33b..2d182a83 100644
--- a/src/servers/Server_Zone/Script/ScriptManager.h
+++ b/src/servers/Server_Zone/Script/ScriptManager.h
@@ -35,8 +35,6 @@ namespace Core
          int32_t init();
          void reload();
 
-         const boost::shared_ptr< chaiscript::ChaiScript >& getHandler() const;
-
          void onPlayerFirstEnterWorld( Entity::Player& player );
 
          static bool registerBnpcTemplate( std::string templateName, uint32_t bnpcBaseId, uint32_t bnpcNameId, uint32_t modelId, std::string aiName );