summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-26 23:43:22 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-26 23:43:22 +0100
commitf87bb1619e7cd438913d5c203183ca35f23928ac (patch)
tree7ea65de7aa83211be19ca35a0a801375f21518b5
parentPossibly fixed Linux makefile (diff)
downloadcuberite-f87bb1619e7cd438913d5c203183ca35f23928ac.tar
cuberite-f87bb1619e7cd438913d5c203183ca35f23928ac.tar.gz
cuberite-f87bb1619e7cd438913d5c203183ca35f23928ac.tar.bz2
cuberite-f87bb1619e7cd438913d5c203183ca35f23928ac.tar.lz
cuberite-f87bb1619e7cd438913d5c203183ca35f23928ac.tar.xz
cuberite-f87bb1619e7cd438913d5c203183ca35f23928ac.tar.zst
cuberite-f87bb1619e7cd438913d5c203183ca35f23928ac.zip
-rw-r--r--GNUmakefile4
-rw-r--r--src/Server.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 981809ffd..1e09ade98 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -47,7 +47,7 @@ ifeq ($(release),1)
# release build - fastest run-time, no gdb support
################
-ifeq ($(disableasm),1)
+ifeq ($(disableofast),1)
CC_OPTIONS = -g -O3 -DNDEBUG
CXX_OPTIONS = -g -O3 -DNDEBUG
else
@@ -64,7 +64,7 @@ ifeq ($(profile),1)
# profile build - a release build with symbols and profiling engine built in
################
-ifeq ($(disableasm),1)
+ifeq ($(disableofast),1)
CC_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
else
diff --git a/src/Server.cpp b/src/Server.cpp
index 5f0e007d7..d889abc53 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -23,7 +23,7 @@
#include "MersenneTwister.h"
-#include "lib/iniFile/iniFile.h"
+#include "../lib/iniFile/iniFile.h"
#include "Vector3f.h"
#include <fstream>