summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-23 15:15:10 +0200
committerMattes D <github@xoft.cz>2014-10-23 15:15:10 +0200
commit449d08cb3d1a8ef430430790fcea0ce36b713866 (patch)
treed6b8c2d3f8ab1dbd9139d964ba130912cae5c949 /lib
parentRemoved the "conditional expression is constant" warning. (diff)
downloadcuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar.gz
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar.bz2
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar.lz
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar.xz
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.tar.zst
cuberite-449d08cb3d1a8ef430430790fcea0ce36b713866.zip
Diffstat (limited to '')
-rw-r--r--lib/inifile/CMakeLists.txt11
-rw-r--r--src/IniFile.cpp (renamed from lib/inifile/iniFile.cpp)2
-rw-r--r--src/IniFile.h (renamed from lib/inifile/iniFile.h)0
3 files changed, 1 insertions, 12 deletions
diff --git a/lib/inifile/CMakeLists.txt b/lib/inifile/CMakeLists.txt
deleted file mode 100644
index 321d501d7..000000000
--- a/lib/inifile/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (iniFile)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../../src/")
-
-file(GLOB SOURCE
- "*.h"
- "*.cpp"
-)
-
-add_library(iniFile ${SOURCE})
diff --git a/lib/inifile/iniFile.cpp b/src/IniFile.cpp
index 7cfe7661f..517fd36af 100644
--- a/lib/inifile/iniFile.cpp
+++ b/src/IniFile.cpp
@@ -24,7 +24,7 @@
#include <ctype.h>
// Local Includes
-#include "iniFile.h"
+#include "IniFile.h"
#if defined(WIN32)
#define iniEOL endl
diff --git a/lib/inifile/iniFile.h b/src/IniFile.h
index 33229bff0..33229bff0 100644
--- a/lib/inifile/iniFile.h
+++ b/src/IniFile.h