From f87bb1619e7cd438913d5c203183ca35f23928ac Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Tue, 26 Nov 2013 22:43:22 +0000
Subject: [PATCH] Fixed Linux compile again

---
 GNUmakefile    | 4 ++--
 src/Server.cpp | 2 +-
 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>