From edce7ebfda180433ddead8fcb70780954ef32aa9 Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alex@cogarr.net>
Date: Thu, 28 Jun 2018 18:35:40 -0600
Subject: Added server to makefile's "all"

Makefile now builds server
---
 src/server/main.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/server/main.cpp')

diff --git a/src/server/main.cpp b/src/server/main.cpp
index 94e0dbd..98acfac 100644
--- a/src/server/main.cpp
+++ b/src/server/main.cpp
@@ -1,7 +1,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../shared/util/hashmap.h"
 extern "C" {
   #include <lua.h>
   #include <lauxlib.h>
@@ -21,10 +20,11 @@ extern "C" {
 #include <btBulletDynamicsCommon.h>
 #include <cstdlib>
 
-#include "../shared/lua_api/common.h"
-#include "../shared/lua_api/load_net.hpp"
-#include "../shared/lua_api/load_phys.hpp"
-#include "../shared/phys/physcommon.hpp"
+#include <shared/lua_api/common.hpp>
+#include <shared/lua_api/load_net.hpp>
+#include <shared/lua_api/load_phys.hpp>
+#include <shared/phys/physcommon.hpp>
+#include <shared/util/hashmap.hpp>
 
 using namespace std;
 using namespace chrono;
@@ -48,8 +48,8 @@ int main (){
 	loadPhysLibs(L);
 	int iErr = luaL_dofile(L,"../data/init.lua");
 	if(iErr != 0){
-		lua_error(L);
 		printf("Failed to open lua file:../data/init.lua\n");
+		lua_error(L);
 	}
 	do{
 		gameloop();
-- 
cgit v1.2.3-70-g09d2