diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..3272dcdf --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,5 @@ +cmake_minimum_required(VERSION 2.6) +add_subdirectory(common) +add_subdirectory(servatrice) +add_subdirectory(cockatrice) +add_subdirectory(oracle) diff --git a/cockatrice/copying b/COPYING similarity index 100% rename from cockatrice/copying rename to COPYING diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt new file mode 100644 index 00000000..3a0d3ea0 --- /dev/null +++ b/cockatrice/CMakeLists.txt @@ -0,0 +1,191 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) +PROJECT(cockatrice) + +SET(cockatrice_SOURCES + src/abstractcounter.cpp + src/counter_general.cpp + src/dlg_creategame.cpp + src/dlg_connect.cpp + src/dlg_create_token.cpp + src/abstractclient.cpp + src/remoteclient.cpp + src/main.cpp + src/window_main.cpp + src/gamesmodel.cpp + src/player.cpp + src/playertarget.cpp + src/cardzone.cpp + src/selectzone.cpp + src/cardlist.cpp + src/abstractcarditem.cpp + src/carditem.cpp + src/tablezone.cpp + src/handzone.cpp + src/handcounter.cpp + src/carddatabase.cpp + src/gameview.cpp + src/gameselector.cpp + src/decklistmodel.cpp + src/dlg_load_deck_from_clipboard.cpp + src/dlg_load_remote_deck.cpp + src/cardinfowidget.cpp + src/messagelogwidget.cpp + src/zoneviewzone.cpp + src/zoneviewwidget.cpp + src/pilezone.cpp + src/stackzone.cpp + src/carddragitem.cpp + src/carddatabasemodel.cpp + src/window_deckeditor.cpp + src/setsmodel.cpp + src/window_sets.cpp + src/abstractgraphicsitem.cpp + src/abstractcarddragitem.cpp + src/dlg_settings.cpp + src/dlg_cardsearch.cpp + src/phasestoolbar.cpp + src/gamescene.cpp + src/arrowitem.cpp + src/arrowtarget.cpp + src/tab.cpp + src/tab_server.cpp + src/tab_room.cpp + src/tab_message.cpp + src/tab_game.cpp + src/tab_deck_storage.cpp + src/tab_supervisor.cpp + src/tab_admin.cpp + src/tab_userlists.cpp + src/chatview.cpp + src/userlist.cpp + src/userinfobox.cpp + src/remotedecklist_treewidget.cpp + src/deckview.cpp + src/playerlistwidget.cpp + src/pixmapgenerator.cpp + src/settingscache.cpp + src/localserver.cpp + src/localserverinterface.cpp + src/localclient.cpp + src/priceupdater.cpp + src/soundengine.cpp +) +SET(cockatrice_HEADERS + src/abstractcounter.h + src/counter_general.h + src/dlg_creategame.h + src/dlg_connect.h + src/dlg_create_token.h + src/gamesmodel.h + src/abstractclient.h + src/remoteclient.h + src/window_main.h + src/cardzone.h + src/selectzone.h + src/player.h + src/playertarget.h + src/abstractcarditem.h + src/carditem.h + src/tablezone.h + src/handzone.h + src/handcounter.h + src/carddatabase.h + src/gameview.h + src/gameselector.h + src/decklistmodel.h + src/dlg_load_deck_from_clipboard.h + src/dlg_load_remote_deck.h + src/cardinfowidget.h + src/messagelogwidget.h + src/zoneviewzone.h + src/zoneviewwidget.h + src/pilezone.h + src/stackzone.h + src/carddragitem.h + src/carddatabasemodel.h + src/window_deckeditor.h + src/setsmodel.h + src/window_sets.h + src/abstractgraphicsitem.h + src/abstractcarddragitem.h + src/dlg_settings.h + src/dlg_cardsearch.h + src/phasestoolbar.h + src/gamescene.h + src/arrowitem.h + src/arrowtarget.h + src/tab.h + src/tab_server.h + src/tab_room.h + src/tab_message.h + src/tab_game.h + src/tab_deck_storage.h + src/tab_supervisor.h + src/tab_admin.h + src/tab_userlists.h + src/chatview.h + src/userlist.h + src/userinfobox.h + src/remotedecklist_treewidget.h + src/deckview.h + src/playerlistwidget.h + src/settingscache.h + src/localserver.h + src/localserverinterface.h + src/localclient.h + src/priceupdater.h + src/soundengine.h + src/pending_command.h +) + +set(cockatrice_RESOURCES cockatrice.qrc) +set(cockatrice_TS + translations/cockatrice_cs.ts + translations/cockatrice_de.ts + translations/cockatrice_en.ts + translations/cockatrice_es.ts + translations/cockatrice_fr.ts + translations/cockatrice_it.ts + translations/cockatrice_ja.ts + translations/cockatrice_pl.ts + translations/cockatrice_pt-br.ts + translations/cockatrice_pt.ts + translations/cockatrice_ru.ts + translations/cockatrice_sk.ts +) + +if(WIN32) + set(cockatrice_SOURCES ${cockatrice_SOURCES} cockatrice.rc) +endif(WIN32) + +if(APPLE) + set(OSX_ICON_FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns) + set_source_files_properties(${OSX_ICON_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + set( cockatrice_SOURCES ${cockatrice_SOURCES} ${OSX_ICON_FILES} ) +ENDIF(APPLE) + +SET(QT_USE_QTNETWORK TRUE) +SET(QT_USE_QTSCRIPT TRUE) +SET(QT_USE_QTMULTIMEDIA TRUE) +SET(QT_USE_QTXML TRUE) +SET(QT_USE_QTSVG TRUE) +FIND_PACKAGE(Qt4 REQUIRED) +if (NOT QT_QTMULTIMEDIA_FOUND) + FIND_PACKAGE(QtMobility REQUIRED) +endif (NOT QT_QTMULTIMEDIA_FOUND) +FIND_PACKAGE(Protobuf REQUIRED) +set(CMAKE_BUILD_TYPE Release) + +QT4_WRAP_CPP(cockatrice_HEADERS_MOC ${cockatrice_HEADERS}) +QT4_ADD_TRANSLATION(${cockatrice_QM} ${cockatrice_TS}) +QT4_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES}) + +INCLUDE(${QT_USE_FILE}) +INCLUDE_DIRECTORIES(../common) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../common) +INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR}) + +ADD_EXECUTABLE(cockatrice ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_HEADERS_MOC}) +TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY} ${PROTOBUF_LIBRARIES}) diff --git a/cockatrice/Doxyfile b/cockatrice/Doxyfile deleted file mode 100644 index 0ae4b93f..00000000 --- a/cockatrice/Doxyfile +++ /dev/null @@ -1,311 +0,0 @@ -# Doxyfile 1.5.5-KDevelop - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = clienttest -PROJECT_NUMBER = 0.1 -OUTPUT_DIRECTORY = -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = YES -STRIP_FROM_PATH = /home/brukie/ -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO -QT_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -OPTIMIZE_FOR_FORTRAN = NO -OPTIMIZE_OUTPUT_VHDL = NO -BUILTIN_STL_SUPPORT = NO -CPP_CLI_SUPPORT = NO -SIP_SUPPORT = NO -IDL_PROPERTY_SUPPORT = YES -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -TYPEDEF_HIDES_STRUCT = NO -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = NO -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -EXTRACT_ANON_NSPACES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_GROUP_NAMES = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO -SHOW_FILES = YES -SHOW_NAMESPACES = YES -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = /home/brukie/clienttest -INPUT_ENCODING = UTF-8 -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.f90 \ - *.f \ - *.vhd \ - *.vhdl \ - *.C \ - *.CC \ - *.C++ \ - *.II \ - *.I++ \ - *.H \ - *.HH \ - *.H++ \ - *.CS \ - *.PHP \ - *.PHP3 \ - *.M \ - *.MM \ - *.PY \ - *.F90 \ - *.F \ - *.VHD \ - *.VHDL \ - *.C \ - *.H \ - *.tlh \ - *.diff \ - *.patch \ - *.moc \ - *.xpm \ - *.dox -RECURSIVE = yes -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXCLUDE_SYMBOLS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = NO -REFERENCES_RELATION = NO -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -GENERATE_DOCSET = NO -DOCSET_FEEDNAME = "Doxygen generated docs" -DOCSET_BUNDLE_ID = org.doxygen.Project -HTML_DYNAMIC_SECTIONS = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = NONE -TREEVIEW_WIDTH = 250 -FORMULA_FONTSIZE = 10 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = YES -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = YES -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = yes -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = clienttest.tag -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -MSCGEN_PATH = -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -DOT_FONTNAME = FreeSans -DOT_FONTPATH = -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -CALLER_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -DOT_GRAPH_MAX_NODES = 50 -MAX_DOT_GRAPH_DEPTH = 1000 -DOT_TRANSPARENT = YES -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO diff --git a/cockatrice/FindQtMobility.cmake b/cockatrice/FindQtMobility.cmake new file mode 100644 index 00000000..8e7edf5e --- /dev/null +++ b/cockatrice/FindQtMobility.cmake @@ -0,0 +1,158 @@ +INCLUDE(FindQt4) + +set(MOBILITY_CONFIG_MKSPECS_FILE "") +IF(EXISTS "${QT_MKSPECS_DIR}/features/mobilityconfig.prf") + set(MOBILITY_CONFIG_MKSPECS_FILE "${QT_MKSPECS_DIR}/features/mobilityconfig.prf") +ELSEIF(EXISTS "${QT_MKSPECS_DIR}/features/mobility.prf") + set(MOBILITY_CONFIG_MKSPECS_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/mobilityconfig.prf") +ENDIF() + +macro(export_component component) + IF(NOT ${MOBILITY_CONFIG_MKSPECS_FILE} STREQUAL "") + FILE(READ ${MOBILITY_CONFIG_MKSPECS_FILE} MOBILITY_FILE_CONTENTS) + STRING(TOLOWER ${component} _COMPONENT) + IF(${MOBILITY_FILE_CONTENTS} MATCHES "MOBILITY_CONFIG=.*${_COMPONENT}.*") + STRING(TOUPPER ${component} _COMPONENT) + SET(QT_MOBILITY_${_COMPONENT}_FOUND 1) + SET(QT_MOBILITY_${_COMPONENT}_INCLUDE_DIR ${QT_MOBILITY_PARENT_INCLUDE_DIR}/Qt${component}) + SET(QT_MOBILITY_${_COMPONENT}_LIBRARY Qt${component}) + ENDIF() + ENDIF() +endmacro() + +set(VERSION_INFO "") +set(FEATURE_FILE_PREFIX "${QT_MKSPECS_DIR}/features/mobility") + +if(DEFINED MOBILITY_VERSION) + if(MOBILITY_VERSION STREQUAL "1.1" AND EXISTS "${FEATURE_FILE_PREFIX}11.prf") + set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}11.prf") + set(VERSION_INFO "1.1") + elseif(MOBILITY_VERSION STREQUAL "1.2" AND EXISTS "${FEATURE_FILE_PREFIX}12.prf") + set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}12.prf") + set(VERSION_INFO "1.2") + elseif(MOBILITY_VERSION STREQUAL "default" AND EXISTS "${FEATURE_FILE_PREFIX}.prf") + set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}.prf") + set(VERSION_INFO "system's default") + else() + message(STATUS "Couldn't find QtMobility version: ${MOBILITY_VERSION}") + endif() +endif() + +if(NOT DEFINED MOBILITY_PRF_FILE) + if(EXISTS "${FEATURE_FILE_PREFIX}.prf") + set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}.prf") + set(VERSION_INFO "system's default") + elseif(EXISTS "${FEATURE_FILE_PREFIX}12.prf") + set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}12.prf") + set(VERSION_INFO "1.2") + elseif(EXISTS "${FEATURE_FILE_PREFIX}11.prf") + set(MOBILITY_PRF_FILE "${FEATURE_FILE_PREFIX}11.prf") + set(VERSION_INFO "1.1") + else() + message(FATAL_ERROR "Couldn't find any version of QtMobility.") + endif() +endif() + +message(STATUS "Using QtMobility version: ${VERSION_INFO}") + +IF(DEFINED MOBILITY_PRF_FILE) + FILE(READ ${MOBILITY_PRF_FILE} MOBILITY_FILE_CONTENTS) + + STRING(REGEX MATCH "MOBILITY_PREFIX=([^\n]+)" QT_MOBILITY_PREFIX "${MOBILITY_FILE_CONTENTS}") + SET(QT_MOBILITY_PREFIX ${CMAKE_MATCH_1}) + + STRING(REGEX MATCH "MOBILITY_INCLUDE=([^\n]+)" QT_MOBILITY_INCLUDE_DIR "${MOBILITY_FILE_CONTENTS}") + SET(QT_MOBILITY_INCLUDE_DIR ${CMAKE_MATCH_1}) + + STRING(REGEX MATCH "MOBILITY_LIB=([^\n]+)" "\\1" QT_MOBILITY_LIBRARY "${MOBILITY_FILE_CONTENTS}") + SET(QT_MOBILITY_LIBRARY_DIR ${CMAKE_MATCH_1}) + + #VERSION + IF(NOT ${MOBILITY_CONFIG_MKSPECS_FILE} STREQUAL "") + FILE(READ ${MOBILITY_CONFIG_MKSPECS_FILE} MOBILITY_CONFIG_FILE_CONTENTS) + STRING(REGEX MATCH "MOBILITY_VERSION = ([^\n]+)" QT_MOBILITY_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}") + SET(QT_MOBILITY_VERSION ${CMAKE_MATCH_1}) + + STRING(REGEX MATCH "MOBILITY_MAJOR_VERSION = ([^\n]+)" QT_MOBILITY_MAJOR_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}") + SET(QT_MOBILITY_MAJOR_VERSION ${CMAKE_MATCH_1}) + + STRING(REGEX MATCH "MOBILITY_MINOR_VERSION = ([^\n]+)" QT_MOBILITY_MINOR_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}") + SET(QT_MOBILITY_MINOR_VERSION ${CMAKE_MATCH_1}) + + STRING(REGEX MATCH "MOBILITY_PATCH_VERSION = ([^\n]+)" QT_MOBILITY_PATCH_VERSION "${MOBILITY_CONFIG_FILE_CONTENTS}") + SET(QT_MOBILITY_PATCH_VERSION ${CMAKE_MATCH_1}) + ELSE() + SET(QT_MOBILITY_VERSION 1.0.0) + SET(QT_MOBILITY_MAJOR_VERSION 1) + SET(QT_MOBILITY_MINOR_VERSION 0) + SET(QT_MOBILITY_PATCH_VERSION 0) + ENDIF() + + SET(QT_MOBILITY_PARENT_INCLUDE_DIR ${QT_MOBILITY_INCLUDE_DIR}) + SET(QT_MOBILITY_INCLUDE_DIR ${QT_MOBILITY_INCLUDE_DIR}/QtMobility) + + IF(QtMobility_FIND_VERSION_EXACT) + IF(QT_MOBILITY_VERSION VERSION_EQUAL QtMobility_FIND_VERSION) + SET(QT_MOBILITY_FOUND TRUE) + ELSE() + SET(QT_MOBILITY_FOUND FALSE) + IF(QT_MOBILITY_VERSION VERSION_LESS QtMobility_FIND_VERSION) + SET(QT_MOBILITY_TOO_OLD TRUE) + ELSE() + SET(QT_MOBILITY_TOO_NEW TRUE) + ENDIF() + ENDIF() + ELSE() + IF(QT_MOBILITY_VERSION VERSION_LESS QtMobility_FIND_VERSION) + SET(QT_MOBILITY_FOUND FALSE) + SET(QT_MOBILITY_TOO_OLD TRUE) + ELSE() + SET(QT_MOBILITY_FOUND TRUE) + ENDIF() + ENDIF() +ELSE() + SET(QT_MOBILITY_FOUND NOTFOUND) + SET(QT_MOBILITY_PREFIX NOTFOUND) + SET(QT_MOBILITY_INCLUDE NOTFOUND) + SET(QT_MOBILITY_LIB NOTFOUND) +ENDIF() + +IF(NOT QT_MOBILITY_FOUND) + if(QT_MOBILITY_TOO_OLD) + MESSAGE(FATAL_ERROR "The installed QtMobility version ${QT_MOBILITY_VERSION} it too old, version ${QtMobility_FIND_VERSION} is required.") + ELSEIF(QT_MOBILITY_TOO_NEW) + MESSAGE(FATAL_ERROR "The installed QtMobility version ${QT_MOBILITY_VERSION} it too new, version ${QtMobility_FIND_VERSION} is required.") + ELSE() + MESSAGE(FATAL_ERROR "QtMobility not found.") + ENDIF() +ELSE() + export_component(Bearer) + export_component(Feedback) + export_component(Gallery) + export_component(PublishSubscribe) + export_component(Location) + export_component(Organizer) + export_component(ServiceFramework) + export_component(SystemInfo) + export_component(Contacts) + export_component(Messaging) + export_component(Versit) + export_component(Sensors) + # VersitOrganizer + if(${QT_MOBILITY_CONTACTS_FOUND} AND ${QT_MOBILITY_VERSIT_FOUND}) + SET(QT_MOBILITY_VERSITORGANIZER_FOUND 1) + SET(QT_MOBILITY_VERSITORGANIZER_INCLUDE_DIR ${QT_MOBILITY_PARENT_INCLUDE_DIR}/QtVersitOrganizer) + SET(QT_MOBILITY_VERSITORGANIZER_LIBRARY QtVersitOrganizer) + endif() + + # MultimediaKit - it's just 'multimedia' in the .prf file. + IF(NOT ${MOBILITY_CONFIG_MKSPECS_FILE} STREQUAL "") + FILE(READ ${MOBILITY_CONFIG_MKSPECS_FILE} MOBILITY_FILE_CONTENTS) + IF(${MOBILITY_FILE_CONTENTS} MATCHES "MOBILITY_CONFIG=.*multimedia.*") + SET(QT_MOBILITY_MULTIMEDIAKIT_FOUND 1) + SET(QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR ${QT_MOBILITY_PARENT_INCLUDE_DIR}/QtMultimediaKit) + SET(QT_MOBILITY_MULTIMEDIAKIT_LIBRARY QtMultimediaKit) + ENDIF() + ENDIF() + +ENDIF() diff --git a/cockatrice/cockatrice.pro b/cockatrice/cockatrice.pro deleted file mode 100644 index bc26db36..00000000 --- a/cockatrice/cockatrice.pro +++ /dev/null @@ -1,210 +0,0 @@ -TEMPLATE = app -TARGET = cockatrice -DEPENDPATH += . src ../common -INCLUDEPATH += . src ../common -MOC_DIR = build -OBJECTS_DIR = build -RESOURCES = cockatrice.qrc -QMAKE_CXXFLAGS_RELEASE += -O2 -CPPFLAGS += -O2 -QT += network script svg -LIBS += -lprotobuf -unix:!macx { - CONFIG += mobility - MOBILITY = multimedia -} else { - QT += multimedia -} - -HEADERS += src/abstractcounter.h \ - src/counter_general.h \ - src/dlg_creategame.h \ - src/dlg_connect.h \ - src/dlg_create_token.h \ - src/gamesmodel.h \ - src/abstractclient.h \ - src/remoteclient.h \ - src/window_main.h \ - src/cardzone.h \ - src/selectzone.h \ - src/player.h \ - src/playertarget.h \ - src/cardlist.h \ - src/abstractcarditem.h \ - src/carditem.h \ - src/tablezone.h \ - src/handzone.h \ - src/handcounter.h \ - src/carddatabase.h \ - src/gameview.h \ - src/gameselector.h \ - src/gametypemap.h \ - src/decklistmodel.h \ - src/dlg_load_deck_from_clipboard.h \ - src/dlg_load_remote_deck.h \ - src/cardinfowidget.h \ - src/messagelogwidget.h \ - src/zoneviewzone.h \ - src/zoneviewwidget.h \ - src/pilezone.h \ - src/stackzone.h \ - src/carddragitem.h \ - src/carddatabasemodel.h \ - src/window_deckeditor.h \ - src/setsmodel.h \ - src/window_sets.h \ - src/abstractgraphicsitem.h \ - src/abstractcarddragitem.h \ - src/dlg_settings.h \ - src/dlg_cardsearch.h \ - src/phasestoolbar.h \ - src/gamescene.h \ - src/arrowitem.h \ - src/arrowtarget.h \ - src/tab.h \ - src/tab_server.h \ - src/tab_room.h \ - src/tab_message.h \ - src/tab_game.h \ - src/tab_deck_storage.h \ - src/tab_supervisor.h \ - src/tab_admin.h \ - src/tab_userlists.h \ - src/chatview.h \ - src/userlist.h \ - src/userinfobox.h \ - src/remotedecklist_treewidget.h \ - src/deckview.h \ - src/playerlistwidget.h \ - src/pixmapgenerator.h \ - src/settingscache.h \ - src/localserver.h \ - src/localserverinterface.h \ - src/localclient.h \ - src/translation.h \ - src/priceupdater.h \ - src/soundengine.h \ - src/pending_command.h \ - ../common/get_pb_extension.h \ - ../common/color.h \ - ../common/decklist.h \ - ../common/rng_abstract.h \ - ../common/rng_sfmt.h \ - ../common/server.h \ - ../common/server_response_containers.h \ - ../common/server_arrow.h \ - ../common/server_card.h \ - ../common/server_cardzone.h \ - ../common/server_room.h \ - ../common/server_counter.h \ - ../common/server_game.h \ - ../common/server_player.h \ - ../common/server_protocolhandler.h \ - ../common/server_arrowtarget.h - -SOURCES += src/abstractcounter.cpp \ - src/counter_general.cpp \ - src/dlg_creategame.cpp \ - src/dlg_connect.cpp \ - src/dlg_create_token.cpp \ - src/abstractclient.cpp \ - src/remoteclient.cpp \ - src/main.cpp \ - src/window_main.cpp \ - src/gamesmodel.cpp \ - src/player.cpp \ - src/playertarget.cpp \ - src/cardzone.cpp \ - src/selectzone.cpp \ - src/cardlist.cpp \ - src/abstractcarditem.cpp \ - src/carditem.cpp \ - src/tablezone.cpp \ - src/handzone.cpp \ - src/handcounter.cpp \ - src/carddatabase.cpp \ - src/gameview.cpp \ - src/gameselector.cpp \ - src/decklistmodel.cpp \ - src/dlg_load_deck_from_clipboard.cpp \ - src/dlg_load_remote_deck.cpp \ - src/cardinfowidget.cpp \ - src/messagelogwidget.cpp \ - src/zoneviewzone.cpp \ - src/zoneviewwidget.cpp \ - src/pilezone.cpp \ - src/stackzone.cpp \ - src/carddragitem.cpp \ - src/carddatabasemodel.cpp \ - src/window_deckeditor.cpp \ - src/setsmodel.cpp \ - src/window_sets.cpp \ - src/abstractgraphicsitem.cpp \ - src/abstractcarddragitem.cpp \ - src/dlg_settings.cpp \ - src/dlg_cardsearch.cpp \ - src/phasestoolbar.cpp \ - src/gamescene.cpp \ - src/arrowitem.cpp \ - src/arrowtarget.cpp \ - src/tab.cpp \ - src/tab_server.cpp \ - src/tab_room.cpp \ - src/tab_message.cpp \ - src/tab_game.cpp \ - src/tab_deck_storage.cpp \ - src/tab_supervisor.cpp \ - src/tab_admin.cpp \ - src/tab_userlists.cpp \ - src/chatview.cpp \ - src/userlist.cpp \ - src/userinfobox.cpp \ - src/remotedecklist_treewidget.cpp \ - src/deckview.cpp \ - src/playerlistwidget.cpp \ - src/pixmapgenerator.cpp \ - src/settingscache.cpp \ - src/localserver.cpp \ - src/localserverinterface.cpp \ - src/localclient.cpp \ - src/priceupdater.cpp \ - src/soundengine.cpp \ - ../common/get_pb_extension.cpp \ - ../common/decklist.cpp \ - ../common/rng_abstract.cpp \ - ../common/rng_sfmt.cpp \ - ../common/sfmt/SFMT.c \ - ../common/server.cpp \ - ../common/server_response_containers.cpp \ - ../common/server_card.cpp \ - ../common/server_cardzone.cpp \ - ../common/server_room.cpp \ - ../common/server_game.cpp \ - ../common/server_player.cpp \ - ../common/server_protocolhandler.cpp - -include ( ../pb_headers ) -include ( ../pb_sources ) - -TRANSLATIONS += \ - translations/cockatrice_de.ts \ - translations/cockatrice_en.ts \ - translations/cockatrice_es.ts \ - translations/cockatrice_pt.ts \ - translations/cockatrice_pt-br.ts \ - translations/cockatrice_fr.ts \ - translations/cockatrice_it.ts \ - translations/cockatrice_ja.ts \ - translations/cockatrice_ru.ts \ - translations/cockatrice_cs.ts \ - translations/cockatrice_pl.ts \ - translations/cockatrice_sk.ts - -win32 { - RC_FILE = cockatrice.rc -} -macx { - ICON = resources/appicon.icns - CONFIG += x86 ppc x86_64 release - LIBS += -bind_at_load -} diff --git a/cockatrice/src/arrowtarget.h b/cockatrice/src/arrowtarget.h index dc3e2036..f68ac335 100644 --- a/cockatrice/src/arrowtarget.h +++ b/cockatrice/src/arrowtarget.h @@ -8,6 +8,7 @@ class Player; class ArrowItem; class ArrowTarget : public AbstractGraphicsItem { + Q_OBJECT protected: Player *owner; private: diff --git a/cockatrice/src/carddragitem.h b/cockatrice/src/carddragitem.h index aae6fbe1..eec2f487 100644 --- a/cockatrice/src/carddragitem.h +++ b/cockatrice/src/carddragitem.h @@ -6,6 +6,7 @@ class CardItem; class CardDragItem : public AbstractCardDragItem { + Q_OBJECT private: int id; bool faceDown; diff --git a/cockatrice/src/pilezone.h b/cockatrice/src/pilezone.h index 4c2188bf..8b8b074e 100644 --- a/cockatrice/src/pilezone.h +++ b/cockatrice/src/pilezone.h @@ -4,6 +4,7 @@ #include "cardzone.h" class PileZone : public CardZone { + Q_OBJECT public: PileZone(Player *_p, const QString &_name, bool _isShufflable, bool _contentsKnown, QGraphicsItem *parent = 0); QRectF boundingRect() const; diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt new file mode 100644 index 00000000..41de51fd --- /dev/null +++ b/common/CMakeLists.txt @@ -0,0 +1,45 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + +SET(common_SOURCES + decklist.cpp + get_pb_extension.cpp + rng_abstract.cpp + rng_qt.cpp + rng_sfmt.cpp + server.cpp + server_card.cpp + server_cardzone.cpp + server_game.cpp + server_player.cpp + server_protocolhandler.cpp + server_response_containers.cpp + server_room.cpp + sfmt/SFMT.c +) +SET(common_HEADERS + decklist.h + rng_abstract.h + rng_qt.h + rng_sfmt.h + server.h + server_arrowtarget.h + server_card.h + server_game.h + server_player.h + server_protocolhandler.h + server_room.h +) + +FIND_PACKAGE(Qt4 REQUIRED) + +set(CMAKE_BUILD_TYPE Release) + +QT4_WRAP_CPP(common_HEADERS_MOC ${common_HEADERS}) +INCLUDE(${QT_USE_FILE}) +INCLUDE_DIRECTORIES(pb) +INCLUDE_DIRECTORIES(sfmt) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + +add_subdirectory(pb) +add_library(cockatrice_common ${common_SOURCES} ${common_HEADERS_MOC}) +target_link_libraries(cockatrice_common cockatrice_protocol) diff --git a/common/pb/CMakeLists.txt b/common/pb/CMakeLists.txt new file mode 100644 index 00000000..4ff832c8 --- /dev/null +++ b/common/pb/CMakeLists.txt @@ -0,0 +1,138 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + +SET(PROTO_FILES + admin_commands.proto + card_attributes.proto + color.proto + command_attach_card.proto + command_concede.proto + command_create_arrow.proto + command_create_counter.proto + command_create_token.proto + command_deck_del_dir.proto + command_deck_del.proto + command_deck_download.proto + command_deck_new_dir.proto + command_deck_select.proto + command_deck_upload.proto + command_del_counter.proto + command_delete_arrow.proto + command_draw_cards.proto + command_dump_zone.proto + command_flip_card.proto + command_game_say.proto + command_inc_card_counter.proto + command_inc_counter.proto + command_kick_from_game.proto + command_leave_game.proto + command_move_card.proto + command_mulligan.proto + command_next_turn.proto + command_ready_start.proto + command_reveal_cards.proto + command_roll_die.proto + command_set_active_phase.proto + command_set_card_attr.proto + command_set_card_counter.proto + command_set_counter.proto + command_set_sideboard_plan.proto + command_shuffle.proto + commands.proto + command_stop_dump_zone.proto + command_undo_draw.proto + context_concede.proto + context_deck_select.proto + context_move_card.proto + context_mulligan.proto + context_ready_start.proto + context_undo_draw.proto + event_add_to_list.proto + event_attach_card.proto + event_connection_closed.proto + event_connection_state_changed.proto + event_create_arrow.proto + event_create_counter.proto + event_create_token.proto + event_del_counter.proto + event_delete_arrow.proto + event_destroy_card.proto + event_draw_cards.proto + event_dump_zone.proto + event_flip_card.proto + event_game_closed.proto + event_game_host_changed.proto + event_game_joined.proto + event_game_say.proto + event_game_state_changed.proto + event_join.proto + event_join_room.proto + event_kicked.proto + event_leave.proto + event_leave_room.proto + event_list_games.proto + event_list_rooms.proto + event_move_card.proto + event_ping.proto + event_player_properties_changed.proto + event_remove_from_list.proto + event_reveal_cards.proto + event_roll_die.proto + event_room_say.proto + event_server_identification.proto + event_server_message.proto + event_server_shutdown.proto + event_set_active_phase.proto + event_set_active_player.proto + event_set_card_attr.proto + event_set_card_counter.proto + event_set_counter.proto + event_shuffle.proto + event_stop_dump_zone.proto + event_user_joined.proto + event_user_left.proto + event_user_message.proto + game_commands.proto + game_event_container.proto + game_event_context.proto + game_event.proto + moderator_commands.proto + move_card_to_zone.proto + response_deck_download.proto + response_deck_list.proto + response_deck_upload.proto + response_dump_zone.proto + response_get_games_of_user.proto + response_get_user_info.proto + response_join_room.proto + response_list_users.proto + response_login.proto + response.proto + room_commands.proto + room_event.proto + serverinfo_arrow.proto + serverinfo_cardcounter.proto + serverinfo_card.proto + serverinfo_counter.proto + serverinfo_deckstorage.proto + serverinfo_game.proto + serverinfo_gametype.proto + serverinfo_playerping.proto + serverinfo_playerproperties.proto + serverinfo_player.proto + serverinfo_room.proto + serverinfo_user.proto + serverinfo_zone.proto + server_message.proto + session_commands.proto + session_event.proto +) + +find_package(Protobuf REQUIRED) +include_directories(${PROTOBUF_INCLUDE_DIRS}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) +PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${PROTO_FILES}) + +set(CMAKE_BUILD_TYPE Release) + +add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS}) +#target_link_libraries(${PROTOBUF_LIBRARIES}) diff --git a/common/pb/proto/admin_commands.proto b/common/pb/admin_commands.proto similarity index 100% rename from common/pb/proto/admin_commands.proto rename to common/pb/admin_commands.proto diff --git a/common/pb/proto/card_attributes.proto b/common/pb/card_attributes.proto similarity index 100% rename from common/pb/proto/card_attributes.proto rename to common/pb/card_attributes.proto diff --git a/common/pb/proto/color.proto b/common/pb/color.proto similarity index 100% rename from common/pb/proto/color.proto rename to common/pb/color.proto diff --git a/common/pb/proto/command_attach_card.proto b/common/pb/command_attach_card.proto similarity index 100% rename from common/pb/proto/command_attach_card.proto rename to common/pb/command_attach_card.proto diff --git a/common/pb/proto/command_concede.proto b/common/pb/command_concede.proto similarity index 100% rename from common/pb/proto/command_concede.proto rename to common/pb/command_concede.proto diff --git a/common/pb/proto/command_create_arrow.proto b/common/pb/command_create_arrow.proto similarity index 100% rename from common/pb/proto/command_create_arrow.proto rename to common/pb/command_create_arrow.proto diff --git a/common/pb/proto/command_create_counter.proto b/common/pb/command_create_counter.proto similarity index 100% rename from common/pb/proto/command_create_counter.proto rename to common/pb/command_create_counter.proto diff --git a/common/pb/proto/command_create_token.proto b/common/pb/command_create_token.proto similarity index 100% rename from common/pb/proto/command_create_token.proto rename to common/pb/command_create_token.proto diff --git a/common/pb/proto/command_deck_del.proto b/common/pb/command_deck_del.proto similarity index 100% rename from common/pb/proto/command_deck_del.proto rename to common/pb/command_deck_del.proto diff --git a/common/pb/proto/command_deck_del_dir.proto b/common/pb/command_deck_del_dir.proto similarity index 100% rename from common/pb/proto/command_deck_del_dir.proto rename to common/pb/command_deck_del_dir.proto diff --git a/common/pb/proto/command_deck_download.proto b/common/pb/command_deck_download.proto similarity index 100% rename from common/pb/proto/command_deck_download.proto rename to common/pb/command_deck_download.proto diff --git a/common/pb/proto/command_deck_new_dir.proto b/common/pb/command_deck_new_dir.proto similarity index 100% rename from common/pb/proto/command_deck_new_dir.proto rename to common/pb/command_deck_new_dir.proto diff --git a/common/pb/proto/command_deck_select.proto b/common/pb/command_deck_select.proto similarity index 100% rename from common/pb/proto/command_deck_select.proto rename to common/pb/command_deck_select.proto diff --git a/common/pb/proto/command_deck_upload.proto b/common/pb/command_deck_upload.proto similarity index 100% rename from common/pb/proto/command_deck_upload.proto rename to common/pb/command_deck_upload.proto diff --git a/common/pb/proto/command_del_counter.proto b/common/pb/command_del_counter.proto similarity index 100% rename from common/pb/proto/command_del_counter.proto rename to common/pb/command_del_counter.proto diff --git a/common/pb/proto/command_delete_arrow.proto b/common/pb/command_delete_arrow.proto similarity index 100% rename from common/pb/proto/command_delete_arrow.proto rename to common/pb/command_delete_arrow.proto diff --git a/common/pb/proto/command_draw_cards.proto b/common/pb/command_draw_cards.proto similarity index 100% rename from common/pb/proto/command_draw_cards.proto rename to common/pb/command_draw_cards.proto diff --git a/common/pb/proto/command_dump_zone.proto b/common/pb/command_dump_zone.proto similarity index 100% rename from common/pb/proto/command_dump_zone.proto rename to common/pb/command_dump_zone.proto diff --git a/common/pb/proto/command_flip_card.proto b/common/pb/command_flip_card.proto similarity index 100% rename from common/pb/proto/command_flip_card.proto rename to common/pb/command_flip_card.proto diff --git a/common/pb/proto/command_game_say.proto b/common/pb/command_game_say.proto similarity index 100% rename from common/pb/proto/command_game_say.proto rename to common/pb/command_game_say.proto diff --git a/common/pb/proto/command_inc_card_counter.proto b/common/pb/command_inc_card_counter.proto similarity index 100% rename from common/pb/proto/command_inc_card_counter.proto rename to common/pb/command_inc_card_counter.proto diff --git a/common/pb/proto/command_inc_counter.proto b/common/pb/command_inc_counter.proto similarity index 100% rename from common/pb/proto/command_inc_counter.proto rename to common/pb/command_inc_counter.proto diff --git a/common/pb/proto/command_kick_from_game.proto b/common/pb/command_kick_from_game.proto similarity index 100% rename from common/pb/proto/command_kick_from_game.proto rename to common/pb/command_kick_from_game.proto diff --git a/common/pb/proto/command_leave_game.proto b/common/pb/command_leave_game.proto similarity index 100% rename from common/pb/proto/command_leave_game.proto rename to common/pb/command_leave_game.proto diff --git a/common/pb/proto/command_move_card.proto b/common/pb/command_move_card.proto similarity index 100% rename from common/pb/proto/command_move_card.proto rename to common/pb/command_move_card.proto diff --git a/common/pb/proto/command_mulligan.proto b/common/pb/command_mulligan.proto similarity index 100% rename from common/pb/proto/command_mulligan.proto rename to common/pb/command_mulligan.proto diff --git a/common/pb/proto/command_next_turn.proto b/common/pb/command_next_turn.proto similarity index 100% rename from common/pb/proto/command_next_turn.proto rename to common/pb/command_next_turn.proto diff --git a/common/pb/proto/command_ready_start.proto b/common/pb/command_ready_start.proto similarity index 100% rename from common/pb/proto/command_ready_start.proto rename to common/pb/command_ready_start.proto diff --git a/common/pb/proto/command_reveal_cards.proto b/common/pb/command_reveal_cards.proto similarity index 100% rename from common/pb/proto/command_reveal_cards.proto rename to common/pb/command_reveal_cards.proto diff --git a/common/pb/proto/command_roll_die.proto b/common/pb/command_roll_die.proto similarity index 100% rename from common/pb/proto/command_roll_die.proto rename to common/pb/command_roll_die.proto diff --git a/common/pb/proto/command_set_active_phase.proto b/common/pb/command_set_active_phase.proto similarity index 100% rename from common/pb/proto/command_set_active_phase.proto rename to common/pb/command_set_active_phase.proto diff --git a/common/pb/proto/command_set_card_attr.proto b/common/pb/command_set_card_attr.proto similarity index 100% rename from common/pb/proto/command_set_card_attr.proto rename to common/pb/command_set_card_attr.proto diff --git a/common/pb/proto/command_set_card_counter.proto b/common/pb/command_set_card_counter.proto similarity index 100% rename from common/pb/proto/command_set_card_counter.proto rename to common/pb/command_set_card_counter.proto diff --git a/common/pb/proto/command_set_counter.proto b/common/pb/command_set_counter.proto similarity index 100% rename from common/pb/proto/command_set_counter.proto rename to common/pb/command_set_counter.proto diff --git a/common/pb/proto/command_set_sideboard_plan.proto b/common/pb/command_set_sideboard_plan.proto similarity index 100% rename from common/pb/proto/command_set_sideboard_plan.proto rename to common/pb/command_set_sideboard_plan.proto diff --git a/common/pb/proto/command_shuffle.proto b/common/pb/command_shuffle.proto similarity index 100% rename from common/pb/proto/command_shuffle.proto rename to common/pb/command_shuffle.proto diff --git a/common/pb/proto/command_stop_dump_zone.proto b/common/pb/command_stop_dump_zone.proto similarity index 100% rename from common/pb/proto/command_stop_dump_zone.proto rename to common/pb/command_stop_dump_zone.proto diff --git a/common/pb/proto/command_undo_draw.proto b/common/pb/command_undo_draw.proto similarity index 100% rename from common/pb/proto/command_undo_draw.proto rename to common/pb/command_undo_draw.proto diff --git a/common/pb/proto/commands.proto b/common/pb/commands.proto similarity index 100% rename from common/pb/proto/commands.proto rename to common/pb/commands.proto diff --git a/common/pb/proto/context_concede.proto b/common/pb/context_concede.proto similarity index 100% rename from common/pb/proto/context_concede.proto rename to common/pb/context_concede.proto diff --git a/common/pb/proto/context_deck_select.proto b/common/pb/context_deck_select.proto similarity index 100% rename from common/pb/proto/context_deck_select.proto rename to common/pb/context_deck_select.proto diff --git a/common/pb/proto/context_move_card.proto b/common/pb/context_move_card.proto similarity index 100% rename from common/pb/proto/context_move_card.proto rename to common/pb/context_move_card.proto diff --git a/common/pb/proto/context_mulligan.proto b/common/pb/context_mulligan.proto similarity index 100% rename from common/pb/proto/context_mulligan.proto rename to common/pb/context_mulligan.proto diff --git a/common/pb/proto/context_ready_start.proto b/common/pb/context_ready_start.proto similarity index 100% rename from common/pb/proto/context_ready_start.proto rename to common/pb/context_ready_start.proto diff --git a/common/pb/proto/context_undo_draw.proto b/common/pb/context_undo_draw.proto similarity index 100% rename from common/pb/proto/context_undo_draw.proto rename to common/pb/context_undo_draw.proto diff --git a/common/pb/proto/event_add_to_list.proto b/common/pb/event_add_to_list.proto similarity index 100% rename from common/pb/proto/event_add_to_list.proto rename to common/pb/event_add_to_list.proto diff --git a/common/pb/proto/event_attach_card.proto b/common/pb/event_attach_card.proto similarity index 100% rename from common/pb/proto/event_attach_card.proto rename to common/pb/event_attach_card.proto diff --git a/common/pb/proto/event_connection_closed.proto b/common/pb/event_connection_closed.proto similarity index 100% rename from common/pb/proto/event_connection_closed.proto rename to common/pb/event_connection_closed.proto diff --git a/common/pb/proto/event_connection_state_changed.proto b/common/pb/event_connection_state_changed.proto similarity index 100% rename from common/pb/proto/event_connection_state_changed.proto rename to common/pb/event_connection_state_changed.proto diff --git a/common/pb/proto/event_create_arrow.proto b/common/pb/event_create_arrow.proto similarity index 100% rename from common/pb/proto/event_create_arrow.proto rename to common/pb/event_create_arrow.proto diff --git a/common/pb/proto/event_create_counter.proto b/common/pb/event_create_counter.proto similarity index 100% rename from common/pb/proto/event_create_counter.proto rename to common/pb/event_create_counter.proto diff --git a/common/pb/proto/event_create_token.proto b/common/pb/event_create_token.proto similarity index 100% rename from common/pb/proto/event_create_token.proto rename to common/pb/event_create_token.proto diff --git a/common/pb/proto/event_del_counter.proto b/common/pb/event_del_counter.proto similarity index 100% rename from common/pb/proto/event_del_counter.proto rename to common/pb/event_del_counter.proto diff --git a/common/pb/proto/event_delete_arrow.proto b/common/pb/event_delete_arrow.proto similarity index 100% rename from common/pb/proto/event_delete_arrow.proto rename to common/pb/event_delete_arrow.proto diff --git a/common/pb/proto/event_destroy_card.proto b/common/pb/event_destroy_card.proto similarity index 100% rename from common/pb/proto/event_destroy_card.proto rename to common/pb/event_destroy_card.proto diff --git a/common/pb/proto/event_draw_cards.proto b/common/pb/event_draw_cards.proto similarity index 100% rename from common/pb/proto/event_draw_cards.proto rename to common/pb/event_draw_cards.proto diff --git a/common/pb/proto/event_dump_zone.proto b/common/pb/event_dump_zone.proto similarity index 100% rename from common/pb/proto/event_dump_zone.proto rename to common/pb/event_dump_zone.proto diff --git a/common/pb/proto/event_flip_card.proto b/common/pb/event_flip_card.proto similarity index 100% rename from common/pb/proto/event_flip_card.proto rename to common/pb/event_flip_card.proto diff --git a/common/pb/proto/event_game_closed.proto b/common/pb/event_game_closed.proto similarity index 100% rename from common/pb/proto/event_game_closed.proto rename to common/pb/event_game_closed.proto diff --git a/common/pb/proto/event_game_host_changed.proto b/common/pb/event_game_host_changed.proto similarity index 100% rename from common/pb/proto/event_game_host_changed.proto rename to common/pb/event_game_host_changed.proto diff --git a/common/pb/proto/event_game_joined.proto b/common/pb/event_game_joined.proto similarity index 100% rename from common/pb/proto/event_game_joined.proto rename to common/pb/event_game_joined.proto diff --git a/common/pb/proto/event_game_say.proto b/common/pb/event_game_say.proto similarity index 100% rename from common/pb/proto/event_game_say.proto rename to common/pb/event_game_say.proto diff --git a/common/pb/proto/event_game_state_changed.proto b/common/pb/event_game_state_changed.proto similarity index 100% rename from common/pb/proto/event_game_state_changed.proto rename to common/pb/event_game_state_changed.proto diff --git a/common/pb/proto/event_join.proto b/common/pb/event_join.proto similarity index 100% rename from common/pb/proto/event_join.proto rename to common/pb/event_join.proto diff --git a/common/pb/proto/event_join_room.proto b/common/pb/event_join_room.proto similarity index 100% rename from common/pb/proto/event_join_room.proto rename to common/pb/event_join_room.proto diff --git a/common/pb/proto/event_kicked.proto b/common/pb/event_kicked.proto similarity index 100% rename from common/pb/proto/event_kicked.proto rename to common/pb/event_kicked.proto diff --git a/common/pb/proto/event_leave.proto b/common/pb/event_leave.proto similarity index 100% rename from common/pb/proto/event_leave.proto rename to common/pb/event_leave.proto diff --git a/common/pb/proto/event_leave_room.proto b/common/pb/event_leave_room.proto similarity index 100% rename from common/pb/proto/event_leave_room.proto rename to common/pb/event_leave_room.proto diff --git a/common/pb/proto/event_list_games.proto b/common/pb/event_list_games.proto similarity index 100% rename from common/pb/proto/event_list_games.proto rename to common/pb/event_list_games.proto diff --git a/common/pb/proto/event_list_rooms.proto b/common/pb/event_list_rooms.proto similarity index 100% rename from common/pb/proto/event_list_rooms.proto rename to common/pb/event_list_rooms.proto diff --git a/common/pb/proto/event_move_card.proto b/common/pb/event_move_card.proto similarity index 100% rename from common/pb/proto/event_move_card.proto rename to common/pb/event_move_card.proto diff --git a/common/pb/proto/event_ping.proto b/common/pb/event_ping.proto similarity index 100% rename from common/pb/proto/event_ping.proto rename to common/pb/event_ping.proto diff --git a/common/pb/proto/event_player_properties_changed.proto b/common/pb/event_player_properties_changed.proto similarity index 100% rename from common/pb/proto/event_player_properties_changed.proto rename to common/pb/event_player_properties_changed.proto diff --git a/common/pb/proto/event_remove_from_list.proto b/common/pb/event_remove_from_list.proto similarity index 100% rename from common/pb/proto/event_remove_from_list.proto rename to common/pb/event_remove_from_list.proto diff --git a/common/pb/proto/event_reveal_cards.proto b/common/pb/event_reveal_cards.proto similarity index 100% rename from common/pb/proto/event_reveal_cards.proto rename to common/pb/event_reveal_cards.proto diff --git a/common/pb/proto/event_roll_die.proto b/common/pb/event_roll_die.proto similarity index 100% rename from common/pb/proto/event_roll_die.proto rename to common/pb/event_roll_die.proto diff --git a/common/pb/proto/event_room_say.proto b/common/pb/event_room_say.proto similarity index 100% rename from common/pb/proto/event_room_say.proto rename to common/pb/event_room_say.proto diff --git a/common/pb/proto/event_server_identification.proto b/common/pb/event_server_identification.proto similarity index 100% rename from common/pb/proto/event_server_identification.proto rename to common/pb/event_server_identification.proto diff --git a/common/pb/proto/event_server_message.proto b/common/pb/event_server_message.proto similarity index 100% rename from common/pb/proto/event_server_message.proto rename to common/pb/event_server_message.proto diff --git a/common/pb/proto/event_server_shutdown.proto b/common/pb/event_server_shutdown.proto similarity index 100% rename from common/pb/proto/event_server_shutdown.proto rename to common/pb/event_server_shutdown.proto diff --git a/common/pb/proto/event_set_active_phase.proto b/common/pb/event_set_active_phase.proto similarity index 100% rename from common/pb/proto/event_set_active_phase.proto rename to common/pb/event_set_active_phase.proto diff --git a/common/pb/proto/event_set_active_player.proto b/common/pb/event_set_active_player.proto similarity index 100% rename from common/pb/proto/event_set_active_player.proto rename to common/pb/event_set_active_player.proto diff --git a/common/pb/proto/event_set_card_attr.proto b/common/pb/event_set_card_attr.proto similarity index 100% rename from common/pb/proto/event_set_card_attr.proto rename to common/pb/event_set_card_attr.proto diff --git a/common/pb/proto/event_set_card_counter.proto b/common/pb/event_set_card_counter.proto similarity index 100% rename from common/pb/proto/event_set_card_counter.proto rename to common/pb/event_set_card_counter.proto diff --git a/common/pb/proto/event_set_counter.proto b/common/pb/event_set_counter.proto similarity index 100% rename from common/pb/proto/event_set_counter.proto rename to common/pb/event_set_counter.proto diff --git a/common/pb/proto/event_shuffle.proto b/common/pb/event_shuffle.proto similarity index 100% rename from common/pb/proto/event_shuffle.proto rename to common/pb/event_shuffle.proto diff --git a/common/pb/proto/event_stop_dump_zone.proto b/common/pb/event_stop_dump_zone.proto similarity index 100% rename from common/pb/proto/event_stop_dump_zone.proto rename to common/pb/event_stop_dump_zone.proto diff --git a/common/pb/proto/event_user_joined.proto b/common/pb/event_user_joined.proto similarity index 100% rename from common/pb/proto/event_user_joined.proto rename to common/pb/event_user_joined.proto diff --git a/common/pb/proto/event_user_left.proto b/common/pb/event_user_left.proto similarity index 100% rename from common/pb/proto/event_user_left.proto rename to common/pb/event_user_left.proto diff --git a/common/pb/proto/event_user_message.proto b/common/pb/event_user_message.proto similarity index 100% rename from common/pb/proto/event_user_message.proto rename to common/pb/event_user_message.proto diff --git a/common/pb/proto/game_commands.proto b/common/pb/game_commands.proto similarity index 100% rename from common/pb/proto/game_commands.proto rename to common/pb/game_commands.proto diff --git a/common/pb/proto/game_event.proto b/common/pb/game_event.proto similarity index 100% rename from common/pb/proto/game_event.proto rename to common/pb/game_event.proto diff --git a/common/pb/proto/game_event_container.proto b/common/pb/game_event_container.proto similarity index 100% rename from common/pb/proto/game_event_container.proto rename to common/pb/game_event_container.proto diff --git a/common/pb/proto/game_event_context.proto b/common/pb/game_event_context.proto similarity index 100% rename from common/pb/proto/game_event_context.proto rename to common/pb/game_event_context.proto diff --git a/common/pb/proto/moderator_commands.proto b/common/pb/moderator_commands.proto similarity index 100% rename from common/pb/proto/moderator_commands.proto rename to common/pb/moderator_commands.proto diff --git a/common/pb/proto/move_card_to_zone.proto b/common/pb/move_card_to_zone.proto similarity index 100% rename from common/pb/proto/move_card_to_zone.proto rename to common/pb/move_card_to_zone.proto diff --git a/common/pb/proto/.directory b/common/pb/proto/.directory deleted file mode 100644 index b95df3b0..00000000 --- a/common/pb/proto/.directory +++ /dev/null @@ -1,5 +0,0 @@ -[Dolphin] -AdditionalInfoV2=Details_Size,Details_Date,CustomizedDetails -Timestamp=2011,12,18,12,16,39 -Version=2 -ViewMode=1 diff --git a/common/pb/proto/response.proto b/common/pb/response.proto similarity index 100% rename from common/pb/proto/response.proto rename to common/pb/response.proto diff --git a/common/pb/proto/response_deck_download.proto b/common/pb/response_deck_download.proto similarity index 100% rename from common/pb/proto/response_deck_download.proto rename to common/pb/response_deck_download.proto diff --git a/common/pb/proto/response_deck_list.proto b/common/pb/response_deck_list.proto similarity index 100% rename from common/pb/proto/response_deck_list.proto rename to common/pb/response_deck_list.proto diff --git a/common/pb/proto/response_deck_upload.proto b/common/pb/response_deck_upload.proto similarity index 100% rename from common/pb/proto/response_deck_upload.proto rename to common/pb/response_deck_upload.proto diff --git a/common/pb/proto/response_dump_zone.proto b/common/pb/response_dump_zone.proto similarity index 100% rename from common/pb/proto/response_dump_zone.proto rename to common/pb/response_dump_zone.proto diff --git a/common/pb/proto/response_get_games_of_user.proto b/common/pb/response_get_games_of_user.proto similarity index 100% rename from common/pb/proto/response_get_games_of_user.proto rename to common/pb/response_get_games_of_user.proto diff --git a/common/pb/proto/response_get_user_info.proto b/common/pb/response_get_user_info.proto similarity index 100% rename from common/pb/proto/response_get_user_info.proto rename to common/pb/response_get_user_info.proto diff --git a/common/pb/proto/response_join_room.proto b/common/pb/response_join_room.proto similarity index 100% rename from common/pb/proto/response_join_room.proto rename to common/pb/response_join_room.proto diff --git a/common/pb/proto/response_list_users.proto b/common/pb/response_list_users.proto similarity index 100% rename from common/pb/proto/response_list_users.proto rename to common/pb/response_list_users.proto diff --git a/common/pb/proto/response_login.proto b/common/pb/response_login.proto similarity index 100% rename from common/pb/proto/response_login.proto rename to common/pb/response_login.proto diff --git a/common/pb/proto/room_commands.proto b/common/pb/room_commands.proto similarity index 100% rename from common/pb/proto/room_commands.proto rename to common/pb/room_commands.proto diff --git a/common/pb/proto/room_event.proto b/common/pb/room_event.proto similarity index 100% rename from common/pb/proto/room_event.proto rename to common/pb/room_event.proto diff --git a/common/pb/proto/server_message.proto b/common/pb/server_message.proto similarity index 100% rename from common/pb/proto/server_message.proto rename to common/pb/server_message.proto diff --git a/common/pb/proto/serverinfo_arrow.proto b/common/pb/serverinfo_arrow.proto similarity index 100% rename from common/pb/proto/serverinfo_arrow.proto rename to common/pb/serverinfo_arrow.proto diff --git a/common/pb/proto/serverinfo_card.proto b/common/pb/serverinfo_card.proto similarity index 100% rename from common/pb/proto/serverinfo_card.proto rename to common/pb/serverinfo_card.proto diff --git a/common/pb/proto/serverinfo_cardcounter.proto b/common/pb/serverinfo_cardcounter.proto similarity index 100% rename from common/pb/proto/serverinfo_cardcounter.proto rename to common/pb/serverinfo_cardcounter.proto diff --git a/common/pb/proto/serverinfo_counter.proto b/common/pb/serverinfo_counter.proto similarity index 100% rename from common/pb/proto/serverinfo_counter.proto rename to common/pb/serverinfo_counter.proto diff --git a/common/pb/proto/serverinfo_deckstorage.proto b/common/pb/serverinfo_deckstorage.proto similarity index 100% rename from common/pb/proto/serverinfo_deckstorage.proto rename to common/pb/serverinfo_deckstorage.proto diff --git a/common/pb/proto/serverinfo_game.proto b/common/pb/serverinfo_game.proto similarity index 100% rename from common/pb/proto/serverinfo_game.proto rename to common/pb/serverinfo_game.proto diff --git a/common/pb/proto/serverinfo_gametype.proto b/common/pb/serverinfo_gametype.proto similarity index 100% rename from common/pb/proto/serverinfo_gametype.proto rename to common/pb/serverinfo_gametype.proto diff --git a/common/pb/proto/serverinfo_player.proto b/common/pb/serverinfo_player.proto similarity index 100% rename from common/pb/proto/serverinfo_player.proto rename to common/pb/serverinfo_player.proto diff --git a/common/pb/proto/serverinfo_playerping.proto b/common/pb/serverinfo_playerping.proto similarity index 100% rename from common/pb/proto/serverinfo_playerping.proto rename to common/pb/serverinfo_playerping.proto diff --git a/common/pb/proto/serverinfo_playerproperties.proto b/common/pb/serverinfo_playerproperties.proto similarity index 100% rename from common/pb/proto/serverinfo_playerproperties.proto rename to common/pb/serverinfo_playerproperties.proto diff --git a/common/pb/proto/serverinfo_room.proto b/common/pb/serverinfo_room.proto similarity index 100% rename from common/pb/proto/serverinfo_room.proto rename to common/pb/serverinfo_room.proto diff --git a/common/pb/proto/serverinfo_user.proto b/common/pb/serverinfo_user.proto similarity index 100% rename from common/pb/proto/serverinfo_user.proto rename to common/pb/serverinfo_user.proto diff --git a/common/pb/proto/serverinfo_zone.proto b/common/pb/serverinfo_zone.proto similarity index 100% rename from common/pb/proto/serverinfo_zone.proto rename to common/pb/serverinfo_zone.proto diff --git a/common/pb/proto/session_commands.proto b/common/pb/session_commands.proto similarity index 100% rename from common/pb/proto/session_commands.proto rename to common/pb/session_commands.proto diff --git a/common/pb/proto/session_event.proto b/common/pb/session_event.proto similarity index 100% rename from common/pb/proto/session_event.proto rename to common/pb/session_event.proto diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt new file mode 100644 index 00000000..c56ab205 --- /dev/null +++ b/oracle/CMakeLists.txt @@ -0,0 +1,19 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(oracle) + +SET(oracle_SOURCES src/main.cpp src/oracleimporter.cpp src/window_main.cpp ../cockatrice/src/carddatabase.cpp ../cockatrice/src/settingscache.cpp) +SET(oracle_HEADERS src/oracleimporter.h src/window_main.h ../cockatrice/src/carddatabase.h ../cockatrice/src/settingscache.h) + +SET(QT_USE_QTNETWORK TRUE) +SET(QT_USE_QTXML TRUE) +SET(QT_USE_QTSVG TRUE) +FIND_PACKAGE(Qt4 REQUIRED) + +set(CMAKE_BUILD_TYPE Release) + +QT4_WRAP_CPP(oracle_HEADERS_MOC ${oracle_HEADERS}) +INCLUDE(${QT_USE_FILE}) +INCLUDE_DIRECTORIES(../cockatrice/src) + +ADD_EXECUTABLE(oracle ${oracle_SOURCES} ${oracle_HEADERS_MOC}) +TARGET_LINK_LIBRARIES(oracle ${QT_LIBRARIES}) diff --git a/oracle/oracle.pro b/oracle/oracle.pro deleted file mode 100644 index 89bfe13f..00000000 --- a/oracle/oracle.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . src -INCLUDEPATH += . src ../cockatrice/src -MOC_DIR = build -OBJECTS_DIR = build -QMAKE_CXXFLAGS_RELEASE += -O2 -QT += network svg xml - -HEADERS += src/oracleimporter.h src/window_main.h ../cockatrice/src/carddatabase.h ../cockatrice/src/settingscache.h -SOURCES += src/main.cpp src/oracleimporter.cpp src/window_main.cpp ../cockatrice/src/carddatabase.cpp ../cockatrice/src/settingscache.cpp - -macx { - CONFIG += x86 ppc x86_64 release - LIBS += -bind_at_load -} diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt new file mode 100644 index 00000000..4f5061f8 --- /dev/null +++ b/servatrice/CMakeLists.txt @@ -0,0 +1,38 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) +PROJECT(servatrice) + +#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../common ${CMAKE_CURRENT_BINARY_DIR}/common) + +SET(servatrice_SOURCES + src/main.cpp + src/passwordhasher.cpp + src/servatrice.cpp + src/server_logger.cpp + src/serversocketinterface.cpp + src/serversocketthread.cpp +) +SET(servatrice_HEADERS + src/servatrice.h + src/server_logger.h + src/serversocketinterface.h + src/serversocketthread.h +) + +SET(QT_DONTUSE_QTGUI) +SET(QT_USE_QTNETWORK TRUE) +SET(QT_USE_QTSQL TRUE) +FIND_PACKAGE(Qt4 REQUIRED) +FIND_PACKAGE(Protobuf REQUIRED) +FIND_PACKAGE(Libgcrypt REQUIRED) +set(CMAKE_BUILD_TYPE Release) + +QT4_WRAP_CPP(servatrice_HEADERS_MOC ${servatrice_HEADERS}) + +INCLUDE(${QT_USE_FILE}) +INCLUDE_DIRECTORIES(../common) +INCLUDE_DIRECTORIES(${LIBGCRYPT_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../common) + +ADD_EXECUTABLE(servatrice ${servatrice_SOURCES} ${servatrice_HEADERS_MOC}) +TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${PROTOBUF_LIBRARIES} ${LIBGCRYPT_LIBRARY}) diff --git a/servatrice/Doxyfile b/servatrice/Doxyfile deleted file mode 100755 index 6f10ab00..00000000 --- a/servatrice/Doxyfile +++ /dev/null @@ -1,311 +0,0 @@ -# Doxyfile 1.5.5-KDevelop - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = servertest -PROJECT_NUMBER = 0.1 -OUTPUT_DIRECTORY = -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = YES -STRIP_FROM_PATH = /home/brukie/ -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO -QT_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -OPTIMIZE_FOR_FORTRAN = NO -OPTIMIZE_OUTPUT_VHDL = NO -BUILTIN_STL_SUPPORT = NO -CPP_CLI_SUPPORT = NO -SIP_SUPPORT = NO -IDL_PROPERTY_SUPPORT = YES -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -TYPEDEF_HIDES_STRUCT = NO -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = NO -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -EXTRACT_ANON_NSPACES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_GROUP_NAMES = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO -SHOW_FILES = YES -SHOW_NAMESPACES = YES -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = /home/brukie/servertest -INPUT_ENCODING = UTF-8 -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.f90 \ - *.f \ - *.vhd \ - *.vhdl \ - *.C \ - *.CC \ - *.C++ \ - *.II \ - *.I++ \ - *.H \ - *.HH \ - *.H++ \ - *.CS \ - *.PHP \ - *.PHP3 \ - *.M \ - *.MM \ - *.PY \ - *.F90 \ - *.F \ - *.VHD \ - *.VHDL \ - *.C \ - *.H \ - *.tlh \ - *.diff \ - *.patch \ - *.moc \ - *.xpm \ - *.dox -RECURSIVE = yes -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXCLUDE_SYMBOLS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = NO -REFERENCES_RELATION = NO -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -GENERATE_DOCSET = NO -DOCSET_FEEDNAME = "Doxygen generated docs" -DOCSET_BUNDLE_ID = org.doxygen.Project -HTML_DYNAMIC_SECTIONS = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = NONE -TREEVIEW_WIDTH = 250 -FORMULA_FONTSIZE = 10 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = YES -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = YES -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = yes -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = servertest.tag -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -MSCGEN_PATH = -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -DOT_FONTNAME = FreeSans -DOT_FONTPATH = -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -CALLER_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -DOT_GRAPH_MAX_NODES = 50 -MAX_DOT_GRAPH_DEPTH = 1000 -DOT_TRANSPARENT = YES -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO diff --git a/servatrice/FindLibgcrypt.cmake b/servatrice/FindLibgcrypt.cmake new file mode 100644 index 00000000..880a5d69 --- /dev/null +++ b/servatrice/FindLibgcrypt.cmake @@ -0,0 +1,46 @@ +# -*- cmake -*- + +# Copied from http://code.google.com/p/emeraldviewer/ + +# - Find libgcrypt +# Find the libgcrypt includes and library +# This module defines +# LIBGCRYPT_INCLUDE_DIR, where to find gcrypt.h, etc. +# LIBGCRYPT_LIBRARIES, the libraries needed to use libgcrypt. +# LIBGCRYPT_FOUND, If false, do not try to use libgcrypt. +# also defined, but not for general use are +# LIBGCRYPT_LIBRARY, where to find the libgcrypt library. + +FIND_PATH(LIBGCRYPT_INCLUDE_DIR gcrypt.h) + +SET(LIBGCRYPT_NAMES ${LIBGCRYPT_NAMES} gcrypt) +FIND_LIBRARY(LIBGCRYPT_LIBRARY + NAMES ${LIBGCRYPT_NAMES} + ) + +IF (LIBGCRYPT_LIBRARY AND LIBGCRYPT_INCLUDE_DIR) + SET(LIBGCRYPT_LIBRARIES ${LIBGCRYPT_LIBRARY}) + SET(LIBGCRYPT_FOUND "YES") +ELSE (LIBGCRYPT_LIBRARY AND LIBGCRYPT_INCLUDE_DIR) + SET(LIBGCRYPT_FOUND "NO") +ENDIF (LIBGCRYPT_LIBRARY AND LIBGCRYPT_INCLUDE_DIR) + + +IF (LIBGCRYPT_FOUND) + IF (NOT LIBGCRYPT_FIND_QUIETLY) + MESSAGE(STATUS "Found libgcrypt: '${LIBGCRYPT_LIBRARIES}' and header in '${LIBGCRYPT_INCLUDE_DIR}'") + ENDIF (NOT LIBGCRYPT_FIND_QUIETLY) +ELSE (LIBGCRYPT_FOUND) + IF (LIBGCRYPT_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find libgcrypt library") + ENDIF (LIBGCRYPT_FIND_REQUIRED) +ENDIF (LIBGCRYPT_FOUND) + +# Deprecated declarations. +SET (NATIVE_LIBGCRYPT_INCLUDE_PATH ${LIBGCRYPT_INCLUDE_DIR} ) +GET_FILENAME_COMPONENT (NATIVE_LIBGCRYPT_LIB_PATH ${LIBGCRYPT_LIBRARY} PATH) + +MARK_AS_ADVANCED( + LIBGCRYPT_LIBRARY + LIBGCRYPT_INCLUDE_DIR + ) diff --git a/servatrice/copying b/servatrice/copying deleted file mode 100755 index 5b6e7c66..00000000 --- a/servatrice/copying +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/servatrice/servatrice.pro b/servatrice/servatrice.pro deleted file mode 100755 index bd66631c..00000000 --- a/servatrice/servatrice.pro +++ /dev/null @@ -1,61 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Fr Sep 5 18:02:29 2008 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . src ../common -INCLUDEPATH += . src ../common -MOC_DIR = build -OBJECTS_DIR = build -LIBS += -lgcrypt -lprotobuf -QMAKE_CXXFLAGS_RELEASE += -O2 - -CONFIG += qt -QT += network sql -QT -= gui - -HEADERS += src/main.h \ - src/servatrice.h \ - src/serversocketinterface.h \ - src/server_logger.h \ - src/serversocketthread.h \ - src/passwordhasher.h \ - ../common/color.h \ - ../common/decklist.h \ - ../common/rng_abstract.h \ - ../common/rng_sfmt.h \ - ../common/server.h \ - ../common/server_response_containers.h \ - ../common/server_arrow.h \ - ../common/server_card.h \ - ../common/server_cardzone.h \ - ../common/server_room.h \ - ../common/server_counter.h \ - ../common/server_game.h \ - ../common/server_player.h \ - ../common/server_protocolhandler.h \ - ../common/server_arrowtarget.h - - -SOURCES += src/main.cpp \ - src/servatrice.cpp \ - src/serversocketinterface.cpp \ - src/server_logger.cpp \ - src/serversocketthread.cpp \ - src/passwordhasher.cpp \ - ../common/decklist.cpp \ - ../common/rng_abstract.cpp \ - ../common/rng_sfmt.cpp \ - ../common/sfmt/SFMT.c \ - ../common/server.cpp \ - ../common/server_response_containers.cpp \ - ../common/server_card.cpp \ - ../common/server_cardzone.cpp \ - ../common/server_room.cpp \ - ../common/server_game.cpp \ - ../common/server_player.cpp \ - ../common/server_protocolhandler.cpp - -include ( ../pb_headers ) -include ( ../pb_sources )