aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile81
-rw-r--r--bin/server/data/.gitignore0
-rw-r--r--bin/server/data/init.lua1
-rw-r--r--build/server/lua_api/.gitignore0
-rw-r--r--build/server/lua_api/phys/.gitignore0
-rw-r--r--build/server/phys/.gitignore0
-rw-r--r--build/server/util/.gitignore0
-rw-r--r--src/server/main.cpp12
8 files changed, 55 insertions, 39 deletions
diff --git a/Makefile b/Makefile
index 2936037..44568f8 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ DOC_DIR=doc
CLIENTNAME=client
SERVERNAME=server
-MASTERNAME=masterserver
+MASTERNAME=#masterserver
+BINS=
EX_PRE = brokengine_
EX_PARTS = $(CLIENTNAME) $(SERVERNAME) $(MASTERNAME)
@@ -103,11 +104,11 @@ LIB_D_BDY=$(LIB_S_BDY)
LIB_D_BLM=$(LIB_S_BLM)
LIB_D_NAN=lib/nanomsg/libnanomsg$(DYN_LIB_EXT)
-DLLS=Irrlicht libnanomsg lua51
-BINS=
+CLIENT_DLLS=Irrlicht libnanomsg lua51
+SERVER_DLLS=libnanomsg lua51
ifeq ($(DEBUG),true)
LIB_OBJS = $(LIB_D_LUA) $(LIB_D_IRR) $(LIB_D_BCO) $(LIB_D_BDY) $(LIB_D_BLM) $(LIB_D_NAN)
- BINS+=$(DLLS:%=$(BIN_DIR)/$(CLIENTNAME)/bin/%$(DYN_LIB_EXT))
+ BINS+=$(CLIENT_DLLS:%=$(BIN_DIR)/$(CLIENTNAME)/bin/%$(DYN_LIB_EXT)) $(SERVER_DLLS:%=$(BIN_DIR)/$(SERVERNAME)/bin/%$(DYN_LIB_EXT))
else
LIB_OBJS = $(LIB_S_LUA) $(LIB_S_IRR) $(LIB_S_BCO) $(LIB_S_BDY) $(LIB_S_BLM) $(LIB_S_NAN)
endif
@@ -149,25 +150,24 @@ ifeq ($(UNAME),Windows)
STATIC_LIBS+=-lws2_32 -lmswsock -ladvapi32
endif
-ifeq ($(UNAME),true)
+ifeq ($(DEBUG),true)
ifeq ($(UNAME),Windows)
LDFLAGS+=-Wl,-subsystem,console
endif
endif
ifeq ($(DEBUG),true)
- CXXFLAGS+=-O0 -g
+ CXXFLAGS+=-O0 -g -Wall -Werror
else
- CXXFLAGS+=-O3
- #LDFLAGS+=--strip-all
+ CXXFLAGS+=-O3 -Wnone
+ LDFLAGS+=--strip-all
endif
FSYSTEM_FOLDERS = lua_api phys util lua_api/irr lua_api/phys lua_api/gui lua_api/scene lua_api/video
CLIENT_BUILD_FOLDERS = $(FSYSTEM_FOLDERS:%=$(BUILD_DIR)/$(CLIENTNAME)/%)
all : $(BINS)
-client : $(CLIENT_PATH)
-server : $(SERVER_PATH)
+ @echo built $(BINS)
SHARED_CLIENT_FILES = lua_api/common phys/physcommon lua_api/phys/bphysbox util/hashmap lua_api/stream lua_api/load_net
SHARED_CLIENT_OBJS = $(SHARED_CLIENT_FILES:%=$(BUILD_DIR)/$(CLIENTNAME)/%.o)
@@ -306,36 +306,48 @@ $(SHARED_CLIENT_OBJS) : $(BUILD_DIR)/$(CLIENTNAME)/%.o : src/shared/%.cpp $(SRC_
#compile server
-SERVER_FILES = main hashmap common physcommon load_net load_phys
-SERVER_OBJS = $(SERVER_FILES:%=$(CLIENT_BUILD_DIR)/%.o)
-$(BIN_DIR)/$(SERVERNAME)/bin/$(EX_PRE)$(SERVERNAME)$(EXE_EXT) : $(SERVER_OBJS)
-$(SERVER_PATH) : $(SERVER_BUILD)main.o $(SERVER_BUILD)hashmap.o $(SERVER_BUILD)common.o $(SERVER_BUILD)physcommon.o $(SERVER_BUILD)load_net.o $(SERVER_BUILD)load_phys.o
- $(CC) $(CFLAGS) -o $(SERVER_PATH) $(SERVER_BUILD)*.o $(STATIC_LIBS) $(SLIBS) $(LDFLAGS)
+SERVER_FILES =
+SHARED_SERVER_FILES= util/hashmap lua_api/common phys/physcommon lua_api/load_net lua_api/load_phys lua_api/phys/bphysbox lua_api/stream
+SHARED_SERVER_OBJS=$(SHARED_SERVER_FILES:%=$(BUILD_DIR)/$(SERVERNAME)/%.o)
+SERVER_OBJS = $(SERVER_FILES:%=$(SERVER_BUILD_DIR)/%.o) $(SHARED_SERVER_OBJS) $(BUILD_DIR)/$(SERVERNAME)/main.o
+
+$(BIN_DIR)/$(SERVERNAME)/bin/$(EX_PRE)$(SERVERNAME)$(EXE_EXT) : $(SERVER_OBJS) $(LIB_OBJS)
+ $(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
+
+# Special, main does not have a .hpp associated with it
+$(BUILD_DIR)/$(SERVERNAME)/main.o : $(SRC_DIR)/server/main.cpp
+ $(CXX) $(CXXFLAGS) -c -o $@ $^
+
+#$(SERVER_PATH) : $(SERVER_BUILD)main.o $(SERVER_BUILD)hashmap.o $(SERVER_BUILD)common.o $(SERVER_BUILD)physcommon.o $(SERVER_BUILD)load_net.o $(SERVER_BUILD)load_phys.o
+ #$(CC) $(CFLAGS) -o $(SERVER_PATH) $(SERVER_BUILD)*.o $(STATIC_LIBS) $(SLIBS) $(LDFLAGS)
+
+$(SHARED_SERVER_OBJS) : $(BUILD_DIR)/$(SERVERNAME)/%.o : $(SRC_DIR)/shared/%.cpp $(SRC_DIR)/shared/%.hpp
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
-$(SERVER_BUILD)main.o : $(SERVER_SRC)main.cpp $(SERVER_SRC)testclient.cpp
- $(CC) $(CFLAGS) -c -o $(SERVER_BUILD)main.o $(SERVER_SRC)main.cpp
+#$(SERVER_BUILD)main.o : $(SERVER_SRC)main.cpp $(SERVER_SRC)testclient.cpp
+ #$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)main.o $(SERVER_SRC)main.cpp
-$(SERVER_BUILD)physcommon.o : $(SHARED_SRC)phys/physcommon.cpp $(SHARED_SRC)phys/physcommon.hpp
- $(CC) $(CFLAGS) -c -o $(SERVER_BUILD)physcommon.o $(SHARED_SRC)phys/physcommon.cpp
+#$(SERVER_BUILD)physcommon.o : $(SHARED_SRC)phys/physcommon.cpp $(SHARED_SRC)phys/physcommon.hpp
+ #$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)physcommon.o $(SHARED_SRC)phys/physcommon.cpp
-$(SERVER_BUILD)hashmap.o : $(SHARED_SRC)util/hashmap.c $(SHARED_SRC)util/hashmap.h
- $(CC) $(CFLAGS) -c -o $(SERVER_BUILD)hashmap.o $(SHARED_SRC)util/hashmap.c
+#$(SERVER_BUILD)hashmap.o : $(SHARED_SRC)util/hashmap.c $(SHARED_SRC)util/hashmap.h
+ #$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)hashmap.o $(SHARED_SRC)util/hashmap.c
-$(SERVER_BUILD)common.o : $(SHARED_SRC)lua_api/common.c $(SHARED_SRC)lua_api/common.h
- $(CC) $(CFLAGS) -c -o $(SERVER_BUILD)common.o $(SHARED_SRC)lua_api/common.c
+#$(SERVER_BUILD)common.o : $(SHARED_SRC)lua_api/common.c $(SHARED_SRC)lua_api/common.h
+ #$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)common.o $(SHARED_SRC)lua_api/common.c
-# Net
-$(SERVER_BUILD)load_net.o : $(SHARED_SRC)lua_api/load_net.cpp $(SHARED_SRC)lua_api/load_net.hpp $(SERVER_BUILD)stream.o
- $(CC) $(CFLAGS) -c -o $(SERVER_BUILD)load_net.o $(SHARED_SRC)lua_api/load_net.cpp
+## Net
+#$(SERVER_BUILD)load_net.o : $(SHARED_SRC)lua_api/load_net.cpp $(SHARED_SRC)lua_api/load_net.hpp $(SERVER_BUILD)stream.o
+ #$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)load_net.o $(SHARED_SRC)lua_api/load_net.cpp
-$(SERVER_BUILD)stream.o : $(SHARED_SRC)lua_api/stream.cpp $(SHARED_SRC)lua_api/stream.hpp
- $(CC) $(CFLAGS) -c -o $(SERVER_BUILD)stream.o $(SHARED_SRC)lua_api/stream.cpp
-# Phys
-$(SERVER_BUILD)load_phys.o: $(SHARED_SRC)lua_api/load_phys.cpp $(SHARED_SRC)lua_api/load_phys.hpp $(SERVER_BUILD)bphysbox.o
- $(CC) $(CFLAGS) -c -o $(SERVER_BUILD)load_phys.o $(SHARED_SRC)lua_api/load_phys.cpp
+#$(SERVER_BUILD)stream.o : $(SHARED_SRC)lua_api/stream.cpp $(SHARED_SRC)lua_api/stream.hpp
+ #$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)stream.o $(SHARED_SRC)lua_api/stream.cpp
+## Phys
+#$(SERVER_BUILD)load_phys.o: $(SHARED_SRC)lua_api/load_phys.cpp $(SHARED_SRC)lua_api/load_phys.hpp $(SERVER_BUILD)bphysbox.o
+ #$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)load_phys.o $(SHARED_SRC)lua_api/load_phys.cpp
-$(SERVER_BUILD)bphysbox.o : $(SHARED_SRC)lua_api/phys/bphysbox.cpp $(SHARED_SRC)lua_api/phys/bphysbox.hpp
- $(CC) $(CFLAGS) -c -o $(SERVER_BUILD)bphysbox.o $(SHARED_SRC)lua_api/phys/bphysbox.cpp
+#$(SERVER_BUILD)bphysbox.o : $(SHARED_SRC)lua_api/phys/bphysbox.cpp $(SHARED_SRC)lua_api/phys/bphysbox.hpp
+ #$(CC) $(CFLAGS) -c -o $(SERVER_BUILD)bphysbox.o $(SHARED_SRC)lua_api/phys/bphysbox.cpp
#end compile server
@@ -380,6 +392,9 @@ $(IRRMADELIB)/lib/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile
$(BIN_DIR)/$(CLIENTNAME)/bin/lua51$(DYN_LIB_EXT) : $(LLUADIR)/src/lua51$(DYN_LIB_EXT)
cp $^ $@
+$(BIN_DIR)/$(SERVERNAME)/bin/lua51$(DYN_LIB_EXT) : $(LLUADIR)/src/lua51$(DYN_LIB_EXT)
+ cp $^ $@
+
$(LIB_D_LUA) : $(LLUADIR)/src/Makefile
@echo "Could not find $(LLUADIR)/src/lua51$(DYN_LIB_EXT), rebuilding"
cd $(LLUADIR)/src && make "BUILDMODE= dynamic"
diff --git a/bin/server/data/.gitignore b/bin/server/data/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bin/server/data/.gitignore
diff --git a/bin/server/data/init.lua b/bin/server/data/init.lua
new file mode 100644
index 0000000..b6ab2f6
--- /dev/null
+++ b/bin/server/data/init.lua
@@ -0,0 +1 @@
+print("Brok[en]gine server lua file init.lua")
diff --git a/build/server/lua_api/.gitignore b/build/server/lua_api/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/build/server/lua_api/.gitignore
diff --git a/build/server/lua_api/phys/.gitignore b/build/server/lua_api/phys/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/build/server/lua_api/phys/.gitignore
diff --git a/build/server/phys/.gitignore b/build/server/phys/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/build/server/phys/.gitignore
diff --git a/build/server/util/.gitignore b/build/server/util/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/build/server/util/.gitignore
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();
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-01-18 08:20:45 +0000