From 30f35ef72479df4844b05e6d11de7a404f5b9816 Mon Sep 17 00:00:00 2001 From: iProgramInCpp Date: Sat, 19 Aug 2023 10:09:49 +0300 Subject: [PATCH] More updates to fix stuff... --- platforms/emscripten/AppPlatform_emscripten.cpp | 2 +- platforms/sdl/AppPlatform_sdl.cpp | 2 +- platforms/sdl/AppPlatform_sdlbase.cpp | 2 +- source/CMakeLists.txt | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/platforms/emscripten/AppPlatform_emscripten.cpp b/platforms/emscripten/AppPlatform_emscripten.cpp index cdd1d67..112b7fb 100644 --- a/platforms/emscripten/AppPlatform_emscripten.cpp +++ b/platforms/emscripten/AppPlatform_emscripten.cpp @@ -2,7 +2,7 @@ #include -#include "client/common/Utils.hpp" +#include "common/Utils.hpp" AppPlatform_emscripten::AppPlatform_emscripten(std::string storageDir, SDL_Window *window) : AppPlatform_sdlbase(storageDir, window) diff --git a/platforms/sdl/AppPlatform_sdl.cpp b/platforms/sdl/AppPlatform_sdl.cpp index 4e8ca09..61f1605 100644 --- a/platforms/sdl/AppPlatform_sdl.cpp +++ b/platforms/sdl/AppPlatform_sdl.cpp @@ -6,7 +6,7 @@ #include "compat/GL.hpp" -#include "client/common/Utils.hpp" +#include "common/Utils.hpp" AppPlatform_sdl::AppPlatform_sdl(std::string storageDir, SDL_Window *window) : AppPlatform_sdlbase(storageDir, window, loadTexture("gui/default_world.png")) diff --git a/platforms/sdl/AppPlatform_sdlbase.cpp b/platforms/sdl/AppPlatform_sdlbase.cpp index 26db7f0..326ca5b 100644 --- a/platforms/sdl/AppPlatform_sdlbase.cpp +++ b/platforms/sdl/AppPlatform_sdlbase.cpp @@ -12,7 +12,7 @@ #include "compat/GL.hpp" #endif -#include "client/common/Utils.hpp" +#include "common/Utils.hpp" void AppPlatform_sdlbase::_init(std::string storageDir, SDL_Window *window) { diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 6d9a561..e914241 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -5,19 +5,13 @@ project(reminecraftpe-core) add_library(reminecraftpe-core STATIC NinecraftApp.cpp common/Random.cpp - common/HitResult.cpp common/Utils.cpp - common/PerlinNoise.cpp - common/ImprovedNoise.cpp common/Matrix.cpp common/Mth.cpp common/Options.cpp common/Timer.cpp - common/Synth.cpp common/CThread.cpp common/Util.cpp - common/Vec3.cpp - common/AABB.cpp network/packets/UpdateBlockPacket.cpp network/packets/RequestChunkPacket.cpp network/packets/PlayerEquipmentPacket.cpp @@ -109,6 +103,12 @@ add_library(reminecraftpe-core STATIC client/player/input/KeyboardInput.cpp client/player/input/ITurnInput.cpp Minecraft.cpp + world/level/levelgen/synth/Synth.cpp + world/level/levelgen/synth/ImprovedNoise.cpp + world/level/levelgen/synth/PerlinNoise.cpp + world/phys/HitResult.cpp + world/phys/Vec3.cpp + world/phys/AABB.cpp world/gamemode/SurvivalMode.cpp world/gamemode/GameMode.cpp world/gamemode/CreativeMode.cpp