fix include directories

bin

@@ -1 +1 @@
-Subproject commit dcb7634dfc9a0aa4d7fa1696a1a453ab347f982a
+Subproject commit 79abf3a441f83376c7bf9c0057b5baf1c099d2b5

include/base/Header.hpp

@@ -6,9 +6,9 @@
 #pragma warning(disable: 4584) // CCKeyboardDelegate included twice in UILayer
 #endif
 
-#include <Macros.hpp>
+#include "Macros.hpp"
 
-#include <gdstdlib.hpp>
+#include <c++stl/gdstdlib.hpp>
 #include <cocos2d.h>
 #include <fmod.hpp>
 #include <cocos-ext.h>

include/cocos/cocos2dx/include/ccTypes.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #define __CCTYPES_H__
 
 #include <string>
-#include <gdstdlib.hpp>
+#include <c++stl/gdstdlib.hpp>
 #include "cocoa/CCGeometry.h"
 #include "CCGL.h"
 

include/loader/GeodeLoader.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Macros.hpp"
+#include <base/Macros.hpp>
 #include "Hook.hpp"
 #include "Log.hpp"
 #include "Mod.hpp"
 #include "Loader.hpp"
 #include "Interface.hpp"
-#include "platform/platform.hpp"
+#include <base/platform/platform.hpp>

include/loader/Loader.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Macros.hpp"
+#include <base/Macros.hpp>
 #include "Types.hpp"
 #include <string_view>
 #include <vector>

include/loader/Types.hpp

@@ -2,7 +2,7 @@
 
 #include "Macros.hpp"
 #include <string>
-#include <platform/cplatform.h>
+#include <base/platform/cplatform.h>
 
 namespace geode {
 	/**

include/utils/Result.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-//#include <Macros.hpp>
+//#include <base/Macros.hpp>
 #include <string_view>
 
 namespace geode {

include/utils/file.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Macros.hpp>
+#include <base/Macros.hpp>
 #include <utils/Result.hpp>
 #include <string>
 #include <utils/types.hpp>

include/utils/general.hpp

@@ -5,7 +5,7 @@
 #include <chrono>
 #include <iomanip>
 
-#include <Macros.hpp>
+#include <base/Macros.hpp>
 #include "Result.hpp"
 
 namespace geode::utils {

include/utils/map.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Macros.hpp>
+#include <base/Macros.hpp>
 #include "Result.hpp"
 #include <string>
 #include <vector>

include/utils/string.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Macros.hpp>
+#include <base/Macros.hpp>
 #include <string>
 #include <vector>
 #include <functional>

include/utils/vector.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Macros.hpp>
+#include <base/Macros.hpp>
 #include <string>
 #include <vector>
 #include <functional>

kit/cmake/Root.cmake

@@ -80,7 +80,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 	# ${GEODE_INCLUDE_DIR}/c++stl
 	# ${GEODE_INCLUDE_DIR}/hook
 	# ${GEODE_INCLUDE_DIR}/loader
-	# ${GEODE_INCLUDE_DIR}/utils
+	${GEODE_INCLUDE_DIR}/utils
 	# ${GEODE_INCLUDE_DIR}/meta
 	${GEODE_INCLUDE_DIR}/cocos/
 	${GEODE_INCLUDE_DIR}/cocos/cocos2dx