diff options
| author | Alexander Pickering <alex@cogarr.net> | 2018-06-28 18:35:40 -0600 |
|---|---|---|
| committer | Alexander Pickering <alex@cogarr.net> | 2018-06-28 18:35:40 -0600 |
| commit | edce7ebfda180433ddead8fcb70780954ef32aa9 (patch) | |
| tree | 16188fb098b4297ec410ca24593c25dfbefdcdf7 /src/server/main.cpp | |
| parent | ef25a513437196a3ea9ee45e6e03565eb86067d2 (diff) | |
| download | brokengine-edce7ebfda180433ddead8fcb70780954ef32aa9.tar.gz brokengine-edce7ebfda180433ddead8fcb70780954ef32aa9.tar.bz2 brokengine-edce7ebfda180433ddead8fcb70780954ef32aa9.zip | |
Added server to makefile's "all"
Makefile now builds server
Diffstat (limited to 'src/server/main.cpp')
| -rw-r--r-- | src/server/main.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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(); |