mirror of
https://github.com/TombEngine/TombEngine.git
synced 2025-04-28 15:57:59 +03:00
Fix merge errors
This commit is contained in:
parent
0165af20e8
commit
2a8d3a2a3f
5 changed files with 15 additions and 3 deletions
|
@ -1,5 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#include "Game/effects/Light.h"
|
||||
#include "Game/items.h"
|
||||
#include "Objects/game_object_ids.h"
|
||||
#include "Renderer/RendererEnums.h"
|
||||
|
||||
using namespace TEN::Effects::Light;
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
#include "Game/control/control.h"
|
||||
#include "Scripting/Internal/TEN/Flow/Settings/Settings.h"
|
||||
|
||||
using namespace TEN::Scripting;
|
||||
|
||||
class ScriptInterfaceLevel;
|
||||
|
||||
class ScriptInterfaceFlowHandler
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "Scripting/Internal/TEN/Flow/Settings/Settings.h"
|
||||
#include "Scripting/Internal/TEN/Logic/LevelFunc.h"
|
||||
#include "Scripting/Internal/TEN/Objects/Lara/WeaponTypes.h"
|
||||
#include "Scripting/Internal/TEN/Types/Rotation/Rotation.h"
|
||||
#include "Scripting/Internal/TEN/Types/Time/Time.h"
|
||||
#include "Scripting/Internal/TEN/Types/Vec2/Vec2.h"
|
||||
#include "Scripting/Internal/TEN/Types/Vec3/Vec3.h"
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
#include "Scripting/Internal/TEN/Types/Vec3/Vec3.h"
|
||||
|
||||
class EulerAngles;
|
||||
class Pose;
|
||||
|
||||
namespace sol { class state; }
|
||||
|
||||
namespace TEN::Scripting
|
||||
|
|
|
@ -3,6 +3,15 @@
|
|||
// Disable Unicode for FMT and spdlog to prevent errors when compiling.
|
||||
#define FMT_UNICODE 0
|
||||
|
||||
// Target Windows 10
|
||||
#define WINVER 0x0A00
|
||||
#define _WIN32_WINNT 0x0A00
|
||||
|
||||
// Include Windows headers
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used Windows features
|
||||
#include <Windows.h>
|
||||
#include <CommCtrl.h>
|
||||
|
||||
// =========
|
||||
// LIBRARIES
|
||||
// =========
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue