summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-05-03 15:02:51 +0200
committerTycho <work.tycho+git@gmail.com>2014-05-03 15:02:51 +0200
commit616ddf5ca50450279198775a598796bb367cf8ce (patch)
tree836b6b8774216e0735aeb63226443e976483e0da
parentFixed polarssl programs included (diff)
downloadcuberite-616ddf5ca50450279198775a598796bb367cf8ce.tar
cuberite-616ddf5ca50450279198775a598796bb367cf8ce.tar.gz
cuberite-616ddf5ca50450279198775a598796bb367cf8ce.tar.bz2
cuberite-616ddf5ca50450279198775a598796bb367cf8ce.tar.lz
cuberite-616ddf5ca50450279198775a598796bb367cf8ce.tar.xz
cuberite-616ddf5ca50450279198775a598796bb367cf8ce.tar.zst
cuberite-616ddf5ca50450279198775a598796bb367cf8ce.zip
-rw-r--r--src/BiomeDef.h2
-rw-r--r--src/ChunkBuffer.h7
-rw-r--r--src/StringUtils.h3
-rw-r--r--src/Vector3.h2
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/ChunkBuffer/CMakeLists.txt6
-rw-r--r--tests/ChunkBuffer/creatable.cpp7
7 files changed, 27 insertions, 2 deletions
diff --git a/src/BiomeDef.h b/src/BiomeDef.h
index 67916890d..f929596e9 100644
--- a/src/BiomeDef.h
+++ b/src/BiomeDef.h
@@ -10,7 +10,7 @@
#pragma once
-
+#include "StringUtils.h"
// tolua_begin
diff --git a/src/ChunkBuffer.h b/src/ChunkBuffer.h
index c23f8971d..410532232 100644
--- a/src/ChunkBuffer.h
+++ b/src/ChunkBuffer.h
@@ -1,6 +1,13 @@
#pragma once
+
+#include <cstring>
+
+
+#include "ChunkDef.h"
+
+
#define CHUNK_SECTION_HEIGHT 16
#define CHUNK_SECTION_NUM (256 / CHUNK_SECTION_HEIGHT)
diff --git a/src/StringUtils.h b/src/StringUtils.h
index b69e47d3c..347fbe909 100644
--- a/src/StringUtils.h
+++ b/src/StringUtils.h
@@ -11,6 +11,9 @@
+#include <string>
+
+
typedef std::string AString;
diff --git a/src/Vector3.h b/src/Vector3.h
index 2c79f9ff1..53fdcf6df 100644
--- a/src/Vector3.h
+++ b/src/Vector3.h
@@ -5,6 +5,8 @@
#define _USE_MATH_DEFINES // Enable non-standard math defines (MSVC)
#include <math.h>
+#include <list>
+#include <vector>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c2f9ceb5a..1e3a01dc8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,4 +2,6 @@ cmake_minimum_required (VERSION 2.6)
enable_testing()
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
add_subdirectory(ChunkBuffer)
diff --git a/tests/ChunkBuffer/CMakeLists.txt b/tests/ChunkBuffer/CMakeLists.txt
index 33722f785..08d01d1a0 100644
--- a/tests/ChunkBuffer/CMakeLists.txt
+++ b/tests/ChunkBuffer/CMakeLists.txt
@@ -2,9 +2,15 @@ cmake_minimum_required (VERSION 2.6)
enable_testing()
+include_directories(${CMAKE_SOURCE_DIR}/src/)
+
add_library(ChunkBuffer ${CMAKE_SOURCE_DIR}/src/ChunkBuffer.cpp)
add_executable(creatable-exe creatable.cpp)
target_link_libraries(creatable-exe ChunkBuffer)
add_test(NAME creatable-test COMMAND creatable-exe)
+
+add_executable(coordinates-exe Coordinates.cpp)
+target_link_libraries(coordinates-exe ChunkBuffer)
+add_test(NAME coordinates-test COMMAND coordinates-exe)
diff --git a/tests/ChunkBuffer/creatable.cpp b/tests/ChunkBuffer/creatable.cpp
index 573f09de9..49204c879 100644
--- a/tests/ChunkBuffer/creatable.cpp
+++ b/tests/ChunkBuffer/creatable.cpp
@@ -1,4 +1,9 @@
+
+#include "TestGlobals.h"
+#include "ChunkBuffer.h"
+
int main(int argc, char** argv)
{
-return 0;
+ cChunkBuffer buffer;
+ return 0;
}