From 0592394c9b54b3a9907afdf39c7ff39cab03078e Mon Sep 17 00:00:00 2001
From: Kargatum <dowlandtop@yandex.com>
Date: Sun, 14 Apr 2019 03:56:09 +0700
Subject: [PATCH] Build: Fix build in actual AC (#5)

* Build: Fix build in actual AC
* Move all to scripts
---
 CMakeLists.txt                 | 26 ++++++++++++++++++++------
 cmake/after_game_lib.cmake     | 12 +++++++++++-
 cmake/after_load_conf.cmake    |  6 +++++-
 cmake/before_game_lib.cmake    |  5 -----
 cmake/before_scripts_lib.cmake |  1 -
 conf/mod_ahbot.conf.dist       |  4 ++--
 6 files changed, 38 insertions(+), 16 deletions(-)
 delete mode 100644 cmake/before_game_lib.cmake
 delete mode 100644 cmake/before_scripts_lib.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea93722..41b6b78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,21 @@
+#
+#
+#
+
+# Set path
 CU_SET_PATH("CMAKE_MOD_AHBOT_DIR" "${CMAKE_CURRENT_LIST_DIR}")
-CU_ADD_HOOK(AFTER_LOAD_CONF "${CMAKE_CURRENT_LIST_DIR}/cmake/after_load_conf.cmake")
-CU_ADD_HOOK(BEFORE_GAME_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/cmake/before_game_lib.cmake")
-CU_ADD_HOOK(BEFORE_SCRIPTS_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/cmake/before_scripts_lib.cmake")
-CU_ADD_HOOK(AFTER_GAME_LIBRARY "${CMAKE_CURRENT_LIST_DIR}/cmake/after_game_lib.cmake")
-AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/cs_ah_bot.cpp")
-AC_ADD_SCRIPT_LOADER("AHBotCommand" "${CMAKE_CURRENT_LIST_DIR}/src/loader_cs_ah_bot.h")
+
+# CMake hooks
+CU_ADD_HOOK(AFTER_LOAD_CONF "${CMAKE_MOD_AHBOT_DIR}/cmake/after_load_conf.cmake")
+CU_ADD_HOOK(AFTER_GAME_LIBRARY "${CMAKE_MOD_AHBOT_DIR}/cmake/after_game_lib.cmake")
+
+# Add SC
+AC_ADD_SCRIPT("${CMAKE_MOD_AHBOT_DIR}/src/cs_ah_bot.cpp")
+AC_ADD_SCRIPT("${CMAKE_MOD_AHBOT_DIR}/src/AuctionHouseBot.cpp")
+AC_ADD_SCRIPT("${CMAKE_MOD_AHBOT_DIR}/src/AuctionHouseBot.h")
+
+# Add SL
+AC_ADD_SCRIPT_LOADER("AHBotCommand" "${CMAKE_MOD_AHBOT_DIR}/src/loader_cs_ah_bot.h")
+
+# Add conf file
+AC_ADD_CONFIG_FILE("${CMAKE_MOD_AHBOT_DIR}/conf/mod_ahbot.conf.dist")
diff --git a/cmake/after_game_lib.cmake b/cmake/after_game_lib.cmake
index f466724..3f681b1 100644
--- a/cmake/after_game_lib.cmake
+++ b/cmake/after_game_lib.cmake
@@ -1 +1,11 @@
-include_directories(${CMAKE_MOD_AHBOT_DIR}/src)
\ No newline at end of file
+#
+#
+#
+
+CollectIncludeDirectories(
+  ${CMAKE_MOD_AHBOT_DIR}/src
+  PUBLIC_INCLUDES)
+
+target_include_directories(game-interface
+  INTERFACE
+    ${PUBLIC_INCLUDES})
diff --git a/cmake/after_load_conf.cmake b/cmake/after_load_conf.cmake
index debc5c9..02b8c1c 100644
--- a/cmake/after_load_conf.cmake
+++ b/cmake/after_load_conf.cmake
@@ -1,2 +1,6 @@
+#
+#
+#
+
+# Add definitions
 add_definitions(-DMOD_AH_BOT)
-AC_ADD_CONFIG_FILE("${CMAKE_MOD_AHBOT_DIR}/conf/mod_ahbot.conf.dist")
diff --git a/cmake/before_game_lib.cmake b/cmake/before_game_lib.cmake
deleted file mode 100644
index 657ee19..0000000
--- a/cmake/before_game_lib.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(game_STAT_SRCS
-	${game_STAT_SRCS}
-	${CMAKE_MOD_AHBOT_DIR}/src/AuctionHouseBot.cpp
-	${CMAKE_MOD_AHBOT_DIR}/src/AuctionHouseBot.h
-)
diff --git a/cmake/before_scripts_lib.cmake b/cmake/before_scripts_lib.cmake
deleted file mode 100644
index f466724..0000000
--- a/cmake/before_scripts_lib.cmake
+++ /dev/null
@@ -1 +0,0 @@
-include_directories(${CMAKE_MOD_AHBOT_DIR}/src)
\ No newline at end of file
diff --git a/conf/mod_ahbot.conf.dist b/conf/mod_ahbot.conf.dist
index 908d4a3..f787b54 100644
--- a/conf/mod_ahbot.conf.dist
+++ b/conf/mod_ahbot.conf.dist
@@ -1,5 +1,5 @@
- [worldserver]
- 
+[worldserver]
+
 ###############################################################################
 # AUCTION HOUSE BOT SETTINGS
 #