forked from Kolyah35/minecraft-pe-0.6.1
restore include paths for cross-platform builds because i messed absolutely every #include up.
This commit is contained in:
@@ -1,11 +1,10 @@
|
||||
#include "Minecraft.h"
|
||||
#include "Options.h"
|
||||
#include "IBuildInput.h"
|
||||
#include "Keyboard.h"
|
||||
#include "Item.h"
|
||||
#include "ItemInstance.h"
|
||||
#include "XperiaPlayInput.h"
|
||||
#include "ControllerTurnInput.h"
|
||||
#include "client/Options.h"
|
||||
#include "client/player/input/IBuildInput.h"
|
||||
#include "platform/input/Keyboard.h"
|
||||
#include "world/item/Item.h"
|
||||
#include "world/item/ItemInstance.h"
|
||||
#include <string>
|
||||
#include <cstdlib>
|
||||
|
||||
@@ -25,13 +24,9 @@
|
||||
#include "../world/level/storage/LevelStorageSource.h"
|
||||
#include "../world/level/storage/LevelStorage.h"
|
||||
#include "player/input/KeyboardInput.h"
|
||||
<<<<<<< HEAD
|
||||
#include "player/input/ControllerTurnInput.h"
|
||||
#include "player/input/XperiaPlayInput.h"
|
||||
#include "world/level/chunk/ChunkSource.h"
|
||||
=======
|
||||
#include "ChunkSource.h"
|
||||
>>>>>>> abfb9e0 (more refactoring for iOS)
|
||||
|
||||
#ifndef STANDALONE_SERVER
|
||||
#include "player/input/touchscreen/TouchInputHolder.h"
|
||||
|
||||
Reference in New Issue
Block a user