Fix build error with unity, compile framework first and then client.

mehah · Nov 15, 2023 · adcebbb · adcebbb
1 parent c1fca76
commit adcebbb
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 53 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -232,53 +232,6 @@ endif()
 # OTClient source files configuration
 # *****************************************************************************
 set(SOURCE_FILES
-	client/animatedtext.cpp
-	client/animator.cpp
-	client/attachableobject.cpp
-	client/attachedeffect.cpp
-	client/attachedeffectmanager.cpp
-	client/client.cpp
-	client/container.cpp
-	client/creature.cpp
-	client/creatures.cpp
-	client/effect.cpp
-	client/game.cpp
-	client/gameconfig.cpp
-	client/houses.cpp
-	client/item.cpp
-	client/itemtype.cpp
-	client/lightview.cpp
-	client/localplayer.cpp
-	client/luafunctions.cpp
-	client/luavaluecasts.cpp
-	client/map.cpp
-	client/mapio.cpp
-	client/mapview.cpp
-	client/minimap.cpp
-	client/missile.cpp
-	client/outfit.cpp
-	client/player.cpp
-	client/position.cpp
-	client/protocolcodes.cpp
-	client/protocolgame.cpp
-	client/protocolgameparse.cpp
-	client/protocolgamesend.cpp
-	client/shadermanager.cpp
-	client/spriteappearances.cpp
-	client/spritemanager.cpp
-	client/statictext.cpp
-	client/thing.cpp
-	client/thingtype.cpp
-	client/thingtypemanager.cpp
-	client/tile.cpp
-	client/towns.cpp
-	client/uicreature.cpp
-	client/uiitem.cpp
-	client/uimap.cpp
-	client/uimapanchorlayout.cpp
-	client/uiminimap.cpp
-	client/uiprogressrect.cpp
-	client/uisprite.cpp
 	framework/core/adaptativeframecounter.cpp
 	framework/core/application.cpp
 	framework/core/asyncdispatcher.cpp
@@ -379,6 +332,54 @@ set(SOURCE_FILES
 	framework/util/color.cpp
 	framework/util/crypt.cpp
 
+	client/animatedtext.cpp
+	client/animator.cpp
+	client/attachableobject.cpp
+	client/attachedeffect.cpp
+	client/attachedeffectmanager.cpp
+	client/client.cpp
+	client/container.cpp
+	client/creature.cpp
+	client/creatures.cpp
+	client/effect.cpp
+	client/game.cpp
+	client/gameconfig.cpp
+	client/houses.cpp
+	client/item.cpp
+	client/itemtype.cpp
+	client/lightview.cpp
+	client/localplayer.cpp
+	client/luafunctions.cpp
+	client/luavaluecasts.cpp
+	client/map.cpp
+	client/mapio.cpp
+	client/mapview.cpp
+	client/minimap.cpp
+	client/missile.cpp
+	client/outfit.cpp
+	client/player.cpp
+	client/position.cpp
+	client/protocolcodes.cpp
+	client/protocolgame.cpp
+	client/protocolgameparse.cpp
+	client/protocolgamesend.cpp
+	client/shadermanager.cpp
+	client/spriteappearances.cpp
+	client/spritemanager.cpp
+	client/statictext.cpp
+	client/thing.cpp
+	client/thingtype.cpp
+	client/thingtypemanager.cpp
+	client/tile.cpp
+	client/towns.cpp
+	client/uicreature.cpp
+	client/uiitem.cpp
+	client/uimap.cpp
+	client/uimapanchorlayout.cpp
+	client/uiminimap.cpp
+	client/uiprogressrect.cpp
+	client/uisprite.cpp
+
 	protobuf/appearances.pb.cc
 	main.cpp
 	androidmain.cpp

diff --git a/src/client/attachableobject.cpp b/src/client/attachableobject.cpp
@@ -21,10 +21,8 @@
  */
 
 #include "attachableobject.h"
-#include "tile.h"
 
 #include <framework/core/eventdispatcher.h>
-#include <framework/core/graphicalapplication.h>
 
 void AttachableObject::attachEffect(const AttachedEffectPtr& obj) {
     if (!obj)

diff --git a/src/client/attachableobject.h b/src/client/attachableobject.h
@@ -22,12 +22,14 @@
 
 #pragma once
 #include "attachedeffect.h"
+#include <framework/luaengine/luaobject.h>
 
- // @bindclass
-#pragma pack(push,1) // disable memory alignment
 class AttachableObject : public LuaObject
 {
 public:
+    AttachableObject() = default;
+    virtual ~AttachableObject() = default;
+
     void attachEffect(const AttachedEffectPtr& obj);
     void clearAttachedEffects();
     bool detachEffectById(uint16_t id);
@@ -49,4 +51,3 @@ class AttachableObject : public LuaObject
     std::vector<AttachedEffectPtr> m_attachedEffects;
     uint8_t m_ownerHidden{ 0 };
 };
-#pragma pack(pop)
diff --git a/src/client/thing.h b/src/client/thing.h
@@ -25,7 +25,6 @@
 #include <framework/core/clock.h>
 #include <framework/graphics/drawpool.h>
 #include <framework/luaengine/luaobject.h>
-#include "attachedeffect.h"
 #include "declarations.h"
 #include "spritemanager.h"
 #include "thingtype.h"