mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-06-21 14:55:32 +00:00
move ConsoleHelpers out of Minecraft.World
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include "Buffer.h"
|
||||
#include "../../../Minecraft.World/ConsoleHelpers/Definitions.h" // 4jcraft TODO
|
||||
#include "console_helpers/Definitions.h" // 4jcraft TODO
|
||||
|
||||
class IntBuffer;
|
||||
class FloatBuffer;
|
||||
|
||||
@@ -44,9 +44,3 @@ public:
|
||||
static void ReverseULONGLONG(int64_t* pullVal);
|
||||
static void ReverseWCHARA(wchar_t* pwch, int iLen);
|
||||
};
|
||||
|
||||
#define MAKE_FOURCC(ch0, ch1, ch2, ch3) \
|
||||
(static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch0)) | \
|
||||
(static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch1)) << 8) | \
|
||||
(static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch2)) << 16) | \
|
||||
(static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch3)) << 24))
|
||||
|
||||
@@ -24,6 +24,7 @@ java_sources = files(
|
||||
|
||||
lib_java = static_library('java',
|
||||
java_sources,
|
||||
dependencies: [console_helpers_dep],
|
||||
# TODO: remove the .. path once arrayWithLength are evaporated
|
||||
include_directories: include_directories('include'),
|
||||
cpp_args : global_cpp_args + global_cpp_defs,
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
#include "java/FileFilter.h"
|
||||
#include "java/File.h"
|
||||
#include "../../Minecraft.World/ConsoleHelpers/PathHelper.h" // 4jcraft TODO
|
||||
#include "../../Minecraft.World/ConsoleHelpers/StringHelpers.h" // 4jcraft TODO
|
||||
#include "console_helpers/PathHelper.h" // 4jcraft TODO
|
||||
#include "console_helpers/StringHelpers.h" // 4jcraft TODO
|
||||
|
||||
const wchar_t File::pathSeparator = L'/';
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include "java/File.h"
|
||||
#include "java/InputOutputStream/FileInputStream.h"
|
||||
#include "../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
|
||||
#include "console_helpers/StringHelpers.h"
|
||||
|
||||
namespace {
|
||||
int64_t FileTell(std::FILE* file) {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "java/File.h"
|
||||
#include "java/InputOutputStream/FileOutputStream.h"
|
||||
|
||||
#include "../../../Minecraft.World/ConsoleHelpers/StringHelpers.h" // 4jcraft TODO
|
||||
#include "console_helpers/StringHelpers.h" // 4jcraft TODO
|
||||
|
||||
// Creates a file output stream to write to the file represented by the
|
||||
// specified File object. A new FileDescriptor object is created to represent
|
||||
|
||||
Reference in New Issue
Block a user