Commit 160ab74c authored by Anselme's avatar Anselme

server is now separated in a lib and an executable

parent 1cdd662d
...@@ -3,9 +3,11 @@ QT -= core gui ...@@ -3,9 +3,11 @@ QT -= core gui
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered c++11 CONFIG += ordered c++11
SUBDIRS = src/common \ SUBDIRS = src/common \
src/serverlib \
src/server \ src/server \
src/client src/client
server.depends = src/common serverlib.depends = src/common
server.depends = src/serverlib src/common
client.depends = src/common client.depends = src/common
...@@ -34,9 +34,8 @@ unix { ...@@ -34,9 +34,8 @@ unix {
INCLUDEPATH += $$include_dir INCLUDEPATH += $$include_dir
INCLUDEPATH += $$src_dir INCLUDEPATH += $$src_dir
SOURCES += *.cpp \ SOURCES += *.cpp
HEADERS += *.h \ HEADERS += *.h
playermessage.h
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "common/mapkoban.h" #include "common/mapkoban.h"
#include <common/defines.h> #include <common/defines.h>
#include "server.h" #include <serverlib/server.h>
int main(int argc, char ** argv) int main(int argc, char ** argv)
{ {
......
...@@ -26,7 +26,7 @@ unix { ...@@ -26,7 +26,7 @@ unix {
DEFINES += SFML_STATIC DEFINES += SFML_STATIC
LIBS += -lcommon LIBS += -lserverlib -lcommon
win32 { win32 {
LIBS += -lsfml-network-s -lws2_32 -lsfml-system-s -lwinmm LIBS += -lsfml-network-s -lws2_32 -lsfml-system-s -lwinmm
} }
...@@ -37,6 +37,4 @@ unix { ...@@ -37,6 +37,4 @@ unix {
INCLUDEPATH += $$include_dir INCLUDEPATH += $$include_dir
INCLUDEPATH += $$src_dir INCLUDEPATH += $$src_dir
SOURCES += *.cpp SOURCES += main.cpp
HEADERS += *.h
TARGET = serverlib
TEMPLATE = lib
CONFIG += staticlib
CONFIG += c++11
QMAKE_CXXFLAGS += -std=c++11
QMAKE_CXXFLAGS += -Wno-comment
DESTDIR = $$lib_dir
QT -= core gui
Debug : DEFINES += DEBUG
LIBPATH += $$lib_dir
unix {
LIBPATH += $$lib_dir/linux_64
}
win32 {
LIBPATH += $$lib_dir/MinGW_32
}
DEFINES += SFML_STATIC
LIBS += -lcommon -lserverlib
win32 {
LIBS += -lsfml-network-s -lws2_32 -lsfml-system-s -lwinmm
}
unix {
LIBS += -lsfml-network-s -lsfml-system-s -ldl -lpthread -ludev
}
INCLUDEPATH += $$include_dir
INCLUDEPATH += $$src_dir
SOURCES += *.cpp
HEADERS += *.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment