Skip to content

Commit

Permalink
qmake: Added separate server.pro for the server
Browse files Browse the repository at this point in the history
The server is always dedicated. During the transition period to fully
unified networking, the server will be sharing the source files of the
"engine" component.

Eventually the "engine" will be renamed "client", and common
functionality is relocated to the shared libs.
  • Loading branch information
skyjake committed Dec 21, 2012
1 parent c91aaaf commit e0f6972
Show file tree
Hide file tree
Showing 4 changed files with 730 additions and 7 deletions.
13 changes: 9 additions & 4 deletions doomsday/doomsday.pro
Expand Up @@ -3,10 +3,15 @@

TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = \
build \
libdeng2 libdeng \
engine plugins host tests
SUBDIRS = \
build \
libdeng2 \
libdeng \
engine \
server \
plugins \
host \
tests

!deng_notools {
SUBDIRS += \
Expand Down
4 changes: 1 addition & 3 deletions doomsday/engine/engine.pro
Expand Up @@ -29,7 +29,7 @@ include(../dep_deng.pri)

# Definitions ----------------------------------------------------------------

DEFINES += __DOOMSDAY__
DEFINES += __DOOMSDAY__ __CLIENT__

!isEmpty(DENG_BUILD) {
!win32: echo(Build number: $$DENG_BUILD)
Expand All @@ -43,8 +43,6 @@ win32 {
OTHER_FILES += api/doomsday.def $$RC_FILE
}
else:macx {
useFramework(Cocoa)
useFramework(QTKit)
}
else {
# Generic Unix.
Expand Down
150 changes: 150 additions & 0 deletions doomsday/server/res/windows/doomsday.rc
@@ -0,0 +1,150 @@
/**\file
*\section License
* License: GPL
* Online License Link: http://www.gnu.org/licenses/gpl.html
*
*\author Copyright (c) 2008-2009 Daniel Swanson <danij@dengine.net>
*
* 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., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA
*/

/**
* doomsday.rc: Doomsday-Server.exe resource script.
*/

#include "../../include/windows/resource.h"

#define APSTUDIO_READONLY_SYMBOLS

#include "windows.h"
#include "../../api/dd_version.h"

#undef APSTUDIO_READONLY_SYMBOLS

// English (U.S.) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
# ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
# endif //_WIN32

# ifdef APSTUDIO_INVOKED
1 TEXTINCLUDE
BEGIN
"resource.h\0"
END

2 TEXTINCLUDE
BEGIN
"#include ""windows.h""\r\n"
"#include ""../../api/dd_version.h""\0"
END

3 TEXTINCLUDE
BEGIN
"#ifndef NO_MANIFEST\r\n"
" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""doomsday-server.exe.manifest""\r\n"
"#endif\r\n"
"\r\n"
"VS_VERSION_INFO VERSIONINFO\r\n"
"FILEVERSION DOOMSDAY_VERSION_NUMBER\r\n"
"PRODUCTVERSION DOOMSDAY_VERSION_NUMBER\r\n"
"# if defined(_DEBUG)\r\n"
"FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE\r\n"
"# elif defined(DOOMSDAY_RELEASE_FULL)\r\n"
"FILEFLAGSMASK VS_FF_SPECIALBUILD\r\n"
"# else\r\n"
"FILEFLAGSMASK 0\r\n"
"# endif\r\n"
"FILEOS VOS_NT_WINDOWS32\r\n"
"FILETYPE VFT_APP\r\n"
"FILESUBTYPE VFT2_UNKNOWN\r\n"
"BEGIN\r\n"
" BLOCK ""StringFileInfo""\r\n"
" BEGIN\r\n"
" BLOCK ""040904b0""\r\n"
" BEGIN\r\n"
" VALUE ""CompanyName"", ""\0""\r\n"
" VALUE ""FileDescription"", ""Doomsday Engine Server\0""\r\n"
" VALUE ""FileVersion"", DOOMSDAY_VERSION_TEXT ""\0""\r\n"
" VALUE ""InternalName"", ""Doomsday Engine Server\0""\r\n"
" VALUE ""LegalCopyright"", ""Copyright � 2003-2012, Deng Team\0""\r\n"
" VALUE ""OriginalFilename"", ""Doomsday-Server.exe\0""\r\n"
" VALUE ""ProductName"", ""Doomsday Engine Server\0""\r\n"
" VALUE ""ProductVersion"", DOOMSDAY_VERSION_TEXT ""\0""\r\n"
"#if !defined(_DEBUG) && !defined(DOOMSDAY_RELEASE_FULL) && defined(DOOMSDAY_RELEASE_NAME)\r\n"
" VALUE ""SpecialBuild"", DOOMSDAY_RELEASE_NAME ""\0""\r\n"
"#endif\r\n"
" END\r\n"
" END\r\n"
"\r\n"
" BLOCK ""VarFileInfo""\r\n"
" BEGIN\r\n"
" VALUE ""Translation"", 0x409, 1200\r\n"
" END\r\n"
"END\r\n"
END
# endif

/**
* Icons:
* Icon with lowest ID value placed first to ensure application icon
* remains consistent on all systems.
*/
IDI_GAME_ICON ICON DISCARDABLE "doomsday.ico"

#endif // English (U.S.) resources

#ifndef APSTUDIO_INVOKED
VS_VERSION_INFO VERSIONINFO
FILEVERSION DOOMSDAY_VERSION_NUMBER
PRODUCTVERSION DOOMSDAY_VERSION_NUMBER
# if defined(_DEBUG)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
# elif !defined(DOOMSDAY_RELEASE_FULL)
FILEFLAGSMASK VS_FF_SPECIALBUILD
# else
FILEFLAGSMASK 0
# endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE VFT2_UNKNOWN
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Doomsday Engine Server\0"
VALUE "FileVersion", DOOMSDAY_VERSION_TEXT "\0"
VALUE "InternalName", "Doomsday Engine Server\0"
VALUE "LegalCopyright", "Copyright � 2003-2012, Deng Team\0"
VALUE "OriginalFilename", "Doomsday-Server.exe\0"
VALUE "ProductName", "Doomsday Engine Server\0"
VALUE "ProductVersion", DOOMSDAY_VERSION_TEXT "\0"
#if !defined(_DEBUG) && !defined(DOOMSDAY_RELEASE_FULL) && defined(DOOMSDAY_RELEASE_NAME)
VALUE "SpecialBuild", DOOMSDAY_RELEASE_NAME "\0"
#endif
END
END

BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif

0 comments on commit e0f6972

Please sign in to comment.