unicode branch gets premake

This commit is contained in:
Enno Rehling 2007-08-05 12:19:56 +00:00
parent 376172adcd
commit 55e0656250
58 changed files with 900 additions and 1031 deletions

2
src/build_vs2005.bat Normal file
View file

@ -0,0 +1,2 @@
REM rebuild eressea projects for VC8
premake --file premake.lua --target vs2005

View file

@ -65,6 +65,7 @@
#include <util/crmessage.h>
#include <util/goodies.h>
#include <util/language.h>
#include <util/log.h>
#include <util/message.h>
#include <util/nrmessage.h>

View file

@ -37,8 +37,9 @@
/* util includes */
#include <util/attrib.h>
#include <util/event.h>
#include <util/base36.h>
#include <util/event.h>
#include <util/log.h>
/* libc includes */
#include <limits.h>

View file

@ -35,7 +35,6 @@ void update_guards(void);
extern void deliverMail(struct faction * f, struct region * r, struct unit * u, const xmlChar *s, struct unit * receiver);
/* eressea-specific. put somewhere else, please. */
#include "resolve.h"
void processorders(void);
extern struct attrib_type at_germs;

View file

@ -62,6 +62,7 @@
#include <util/bsdstring.h>
#include <util/event.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/rand.h>
#include <util/rng.h>

View file

@ -56,9 +56,10 @@
/* util includes */
#include <util/attrib.h>
#include <util/rand.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/message.h>
#include <util/rand.h>
#include <util/rng.h>
/* libc includes */

View file

@ -27,7 +27,9 @@
#include <kernel/unit.h>
/* util includes */
#include <util/attrib.h>
#include <util/functions.h>
#include <util/log.h>
/* libc includes */
#include <assert.h>

View file

@ -72,7 +72,7 @@ herbsearch(region * r, unit * u, int max)
if (max) max = min(max, rherbs(r));
else max = rherbs(r);
herbsfound = ntimespprob(eff_skill(u, SK_HERBALISM, r) * u->number,
(double)rherbs(r)/100.0L, -0.01L);
(double)rherbs(r)/100.0F, -0.01F);
herbsfound = min(herbsfound, max);
rsetherbs(r, rherbs(r)-herbsfound);

View file

@ -48,9 +48,6 @@
#include <attributes/otherfaction.h>
#include <attributes/moved.h>
/* items includes */
#include <items/demonseye.h>
/* util includes */
#include <util/attrib.h>
#include <util/base36.h>

View file

@ -21,8 +21,9 @@
#include "terrain.h"
#include "unit.h"
#include <util/rng.h>
#include <util/attrib.h>
#include <util/log.h>
#include <util/rng.h>
/* libc includes */
#include <assert.h>
@ -536,15 +537,15 @@ read_borders(FILE * f)
from = findregion(fx, fy);
if (from==NULL) {
if (!incomplete_data) {
log_error(("border for unknown region %d,%d\n", fx, fy));
}
log_error(("border for unknown region %d,%d\n", fx, fy));
}
from = new_region(fx, fy);
}
to = findregion(tx, ty);
if (to==NULL) {
if (!incomplete_data) {
log_error(("border for unknown region %d,%d\n", tx, ty));
}
log_error(("border for unknown region %d,%d\n", tx, ty));
}
to = new_region(tx, ty);
}

View file

@ -45,13 +45,14 @@
#include "unit.h"
/* from libutil */
#include <attrib.h>
#include <base36.h>
#include <event.h>
#include <goodies.h>
#include <parser.h>
#include <resolve.h>
#include <xml.h>
#include <util/attrib.h>
#include <util/base36.h>
#include <util/event.h>
#include <util/goodies.h>
#include <util/log.h>
#include <util/parser.h>
#include <util/resolve.h>
#include <util/xml.h>
/* from libc */
#include <assert.h>

View file

@ -38,12 +38,13 @@
#include "version.h"
/* util includes */
#include <util/resolve.h>
#include <util/base36.h>
#include <util/goodies.h>
#include <util/log.h>
#include <util/nrmessage.h>
#include <util/rand.h>
#include <util/resolve.h>
#include <util/rng.h>
#include <util/goodies.h>
#include <util/variant.h>
/* libc includes */

View file

@ -381,8 +381,6 @@ extern void reorder_owners(struct region * r);
extern const char *localenames[];
#include <log.h>
#ifdef _MSC_VER
#include <stdafx.h>
#endif

View file

@ -33,6 +33,7 @@
#include <util/event.h>
#include <util/goodies.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/resolve.h>
#include <util/rng.h>
#include <util/variant.h>

View file

@ -73,7 +73,7 @@ init_group(faction * f, group * g)
static group *
find_groupbyname(group * g, const xmlChar * name)
{
while (g && strcasecmp(name, g->name)) g = g->next;
while (g && xml_strcasecmp(name, g->name)) g = g->next;
return g;
}

View file

@ -54,6 +54,7 @@
/* util includes */
#include <util/attrib.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/parser.h>
#include <util/resolve.h>
#include <util/rand.h>

View file

@ -32,6 +32,7 @@
#include "unit.h"
#include <util/parser.h>
#include <util/log.h>
#include <assert.h>
#include <stdlib.h>

View file

@ -47,6 +47,7 @@
#include <util/attrib.h>
#include <util/bsdstring.h>
#include <util/functions.h>
#include <util/log.h>
#include <util/rng.h>
/* attrib includes */
@ -393,44 +394,3 @@ read_race_reference(const struct race ** rp, FILE * F)
}
return AT_READ_OK;
}
/* Die Funktionen werden über den hier registrierten Namen in races.xml
* in die jeweilige Rassendefiniton eingebunden */
void
register_races(void)
{
char zBuffer[MAX_PATH];
/* function initfamiliar */
register_function((pf_generic)oldfamiliars, "oldfamiliars");
/* function move
* into which regiontyp moving is allowed for this race
* race->move_allowed() */
register_function((pf_generic)allowed_swim, "moveswimming");
register_function((pf_generic)allowed_walk, "movewalking");
register_function((pf_generic)allowed_fly, "moveflying");
register_function((pf_generic)allowed_dragon, "movedragon");
/* function age
* race->age() */
register_function((pf_generic)age_undead, "ageundead");
register_function((pf_generic)age_illusion, "ageillusion");
register_function((pf_generic)age_skeleton, "ageskeleton");
register_function((pf_generic)age_zombie, "agezombie");
register_function((pf_generic)age_ghoul, "ageghoul");
register_function((pf_generic)age_dragon, "agedragon");
register_function((pf_generic)age_firedragon, "agefiredragon");
/* function itemdrop
* to generate battle spoils
* race->itemdrop() */
register_function((pf_generic)default_spoil, "defaultdrops");
register_function((pf_generic)equip_newunits, "equip_newunits");
sprintf(zBuffer, "%s/races.xml", resourcepath());
}
void
init_races(void)
{
}

View file

@ -166,8 +166,6 @@ extern const xmlChar * racename(const struct locale *lang, const struct unit *u,
extern boolean allowed_dragon(const struct region * src, const struct region * target);
extern void register_races(void);
extern void init_races(void);
extern boolean r_insectstalled(const struct region *r);
extern void add_raceprefix(const char *);

View file

@ -43,6 +43,7 @@
/* util includes */
#include <util/attrib.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/resolve.h>
#include <util/umlaut.h>
#include <util/language.h>

View file

@ -47,6 +47,7 @@
#include <util/functions.h>
#include <util/goodies.h>
#include <util/lists.h>
#include <util/log.h>
/* libc includes */
#include <assert.h>
@ -808,7 +809,8 @@ void
spunit(struct strlist ** SP, const struct faction * f, const unit * u, int indent,
int mode)
{
int dh = bufunit(f, u, indent, mode);
char buf[DISPLAYSIZE];
int dh = bufunit(f, u, indent, mode, buf, sizeof(buf));
lparagraph(SP, buf, indent, (char) ((u->faction == f) ? '*' : (dh ? '+' : '-')));
}
@ -1351,6 +1353,7 @@ nmr_warnings(void)
for (fa=factions;fa;fa=fa->next) {
if (alliedfaction(NULL, f, fa, FRIEND) && alliedfaction(NULL, fa, f, FRIEND)) {
if (msg==NULL) {
char buf[4096];
sprintf(buf, "Achtung: %s hat einige Zeit keine "
"Züge eingeschickt und könnte dadurch in Kürze aus dem "
"Spiel ausscheiden.", factionname(f));

View file

@ -60,6 +60,7 @@
#include <util/filereader.h>
#include <util/goodies.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/parser.h>
#include <util/resolve.h>
#include <util/sql.h>
@ -500,7 +501,7 @@ factionorders(void)
fflush(stdout);
}
if (checkpasswd(f, pass, true) == false) {
if (!checkpasswd(f, (const char *)pass, true)) {
log_warning(("Invalid password for faction %s\n", itoa36(fid)));
ADDMSG(&f->msgs, msg_message("wrongpasswd", "faction password",
f->no, pass));
@ -1444,7 +1445,7 @@ readfaction(FILE * F)
if (global.data_version >= OVERRIDE_VERSION) {
rds(F, &f->override);
} else {
f->override = xstrdup(itoa36(rng_int()));
f->override = strdup(itoa36(rng_int()));
}
if (global.data_version < LOCALE_VERSION) {

View file

@ -35,6 +35,7 @@
/* util includes */
#include <util/goodies.h>
#include <util/language.h>
#include <util/log.h>
#include <util/umlaut.h>
/* Bitte die Sprüche nach Gebieten und Stufe ordnen, denn in derselben

View file

@ -29,6 +29,8 @@
#include "region.h"
#include "resources.h"
#include <util/log.h>
/* libc includes */
#include <assert.h>
#include <stdlib.h>

View file

@ -33,9 +33,10 @@ without prior permission by the authors of Eressea.
#include <util/attrib.h>
#include <util/crmessage.h>
#include <util/functions.h>
#include <util/language.h>
#include <util/log.h>
#include <util/message.h>
#include <util/nrmessage.h>
#include <util/language.h>
/* libxml includes */
#include <libxml/tree.h>

View file

@ -52,6 +52,7 @@
#include <util/functions.h>
#include <util/goodies.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/resolve.h>
#include <util/rng.h>

View file

@ -29,6 +29,7 @@
#include <util/base36.h>
#include <util/goodies.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/rng.h>
#include <util/sql.h>
@ -220,7 +221,7 @@ read_newfactions(const char * filename)
itoa36(subscription), email));
continue;
}
nf->password = (xmlChar *)strdup(password);
nf->password = strdup(password);
nf->race = rc_find(race);
nf->subscription = subscription;
if (alliances!=NULL) {

View file

@ -23,7 +23,7 @@ struct newfaction;
typedef struct newfaction {
struct newfaction * next;
char * email;
xmlChar * password;
char * password;
const struct locale * lang;
const struct race * race;
int bonus;

View file

@ -40,6 +40,7 @@
#include <util/event.h>
#include <util/goodies.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/umlaut.h>
#include <util/parser.h>
#include <util/rng.h>
@ -682,8 +683,8 @@ gm_addfaction(const char * email, plane * p, region * r)
a_add(&f->attribs, make_key(atoi36("quest")));
f->banner = (xmlChar*)strdup("quest faction");
f->name = (xmlChar*)strdup("quest faction");
f->passw = (xmlChar*)strdup(itoa36(rng_int()));
f->override = (xmlChar*)strdup(itoa36(rng_int()));
f->passw = strdup(itoa36(rng_int()));
f->override = strdup(itoa36(rng_int()));
if (set_email(&f->email, email)!=0) {
log_error(("Invalid email address for faction %s: %s\n", itoa36(f->no), email));
}

136
src/common/races/races.c Normal file
View file

@ -0,0 +1,136 @@
/* vi: set ts=2:
* +-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de>
* | | Enno Rehling <enno@eressea.de>
* | Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de>
* | (c) 1998 - 2007 |
* | | This program may not be used, modified or distributed
* +-------------------+ without prior permission by the authors of Eressea.
*
*/
#include "../../config.h"
#include <eressea.h>
#include "races.h"
#include "zombies.h"
#include "illusion.h"
#include "dragons.h"
#include <kernel/building.h>
#include <kernel/equipment.h>
#include <kernel/faction.h>
#include <kernel/item.h>
#include <kernel/pathfinder.h>
#include <kernel/race.h>
#include <kernel/region.h>
#include <kernel/ship.h>
#include <kernel/terrain.h>
#include <kernel/unit.h>
#include <util/attrib.h>
#include <util/functions.h>
#include <util/rng.h>
static void
oldfamiliars(unit * u)
{
char fname[64];
/* these familiars have no special skills.
*/
snprintf(fname, sizeof(fname), "%s_familiar", u->race->_name[0]);
create_mage(u, M_GRAU);
equip_unit(u, get_equipment(fname));
}
static void
set_show_item(faction *f, item_t i)
{
attrib *a = a_add(&f->attribs, a_new(&at_showitem));
a->data.v = (void*)olditemtype[i];
}
static void
equip_newunits(const struct equipment * eq, struct unit *u)
{
struct region *r = u->region;
switch (old_race(u->race)) {
case RC_ELF:
set_show_item(u->faction, I_FEENSTIEFEL);
break;
case RC_GOBLIN:
set_show_item(u->faction, I_RING_OF_INVISIBILITY);
set_number(u, 10);
break;
case RC_HUMAN:
if (u->building==NULL) {
const building_type * btype = bt_find("castle");
if (btype!=NULL) {
building *b = new_building(btype, r, u->faction->locale);
b->size = 10;
u->building = b;
fset(u, UFL_OWNER);
}
}
break;
case RC_CAT:
set_show_item(u->faction, I_RING_OF_INVISIBILITY);
break;
case RC_AQUARIAN:
{
ship *sh = new_ship(st_find("boat"), u->faction->locale, r);
sh->size = sh->type->construction->maxsize;
u->ship = sh;
fset(u, UFL_OWNER);
}
break;
case RC_CENTAUR:
rsethorses(r, 250+rng_int()%51+rng_int()%51);
break;
}
}
static item *
default_spoil(const struct race * rc, int size)
{
item * itm = NULL;
if (rng_int()%100 < RACESPOILCHANCE) {
char spoilname[32];
const item_type * itype;
sprintf(spoilname, "%sspoil", rc->_name[0]);
itype = it_find(spoilname);
if (itype!=NULL) {
i_add(&itm, i_new(itype, size));
}
}
return itm;
}
/* Die Funktionen werden über den hier registrierten Namen in races.xml
* in die jeweilige Rassendefiniton eingebunden */
void
register_races(void)
{
/* function initfamiliar */
register_function((pf_generic)oldfamiliars, "oldfamiliars");
register_function((pf_generic)allowed_dragon, "movedragon");
/* function age
* race->age() */
register_function((pf_generic)age_undead, "ageundead");
register_function((pf_generic)age_illusion, "ageillusion");
register_function((pf_generic)age_skeleton, "ageskeleton");
register_function((pf_generic)age_zombie, "agezombie");
register_function((pf_generic)age_ghoul, "ageghoul");
register_function((pf_generic)age_dragon, "agedragon");
register_function((pf_generic)age_firedragon, "agefiredragon");
/* function itemdrop
* to generate battle spoils
* race->itemdrop() */
register_function((pf_generic)default_spoil, "defaultdrops");
register_function((pf_generic)equip_newunits, "equip_newunits");
}

25
src/common/races/races.h Normal file
View file

@ -0,0 +1,25 @@
/* vi: set ts=2:
* +-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de>
* | | Enno Rehling <enno@eressea.de>
* | Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de>
* | (c) 1998 - 2007 |
* | | This program may not be used, modified or distributed
* +-------------------+ without prior permission by the authors of Eressea.
*
*/
#ifndef H_RACES
#define H_RACES
#ifdef __cplusplus
extern "C" {
#endif
extern void register_races(void);
#ifdef __cplusplus
}
#endif
#endif

View file

@ -26,6 +26,7 @@
#include <util/base36.h>
#include <util/functions.h>
#include <util/language.h>
#include <util/log.h>
/* libc includes */
#include <string.h>

View file

@ -23,14 +23,8 @@
#include "alp.h"
#include "combatspells.h"
#include <kernel/curse.h>
#include <util/nrmessage.h>
#include <util/bsdstring.h>
struct curse_type;
extern void ct_register(const struct curse_type * ct);
/* kernel includes */
#include <kernel/curse.h>
#include <kernel/battle.h> /* für lovar */
#include <kernel/border.h>
#include <kernel/building.h>
@ -69,6 +63,9 @@ extern void ct_register(const struct curse_type * ct);
#include <util/functions.h>
#include <util/lists.h>
#include <util/rand.h>
#include <util/log.h>
#include <util/nrmessage.h>
#include <util/bsdstring.h>
#include <util/variant.h>
#include <util/goodies.h>
#include <util/resolve.h>

View file

@ -24,6 +24,7 @@
/* util includes */
#include <util/attrib.h>
#include <util/event.h>
#include <util/log.h>
#include <util/resolve.h>
#include <util/base36.h>

View file

@ -23,6 +23,7 @@
/* util includes */
#include <util/attrib.h>
#include <util/event.h>
#include <util/log.h>
#include <util/resolve.h>
#include <util/base36.h>

View file

@ -24,6 +24,7 @@
/* util includes */
#include <util/attrib.h>
#include <util/event.h>
#include <util/log.h>
#include <util/resolve.h>
#include <util/base36.h>

View file

@ -24,6 +24,7 @@
/* util includes */
#include <util/attrib.h>
#include <util/event.h>
#include <util/log.h>
#include <util/resolve.h>
#include <util/base36.h>

View file

@ -24,6 +24,7 @@
#include <util/attrib.h>
#include <util/base36.h>
#include <util/event.h>
#include <util/log.h>
#include <util/resolve.h>
/* ansi includes */
@ -62,8 +63,9 @@ giveitem_handle(trigger * t, void * data)
giveitem_data * td = (giveitem_data*)t->data.v;
if (td->u!=NULL) {
i_change(&td->u->items, td->itype, td->number);
} else
} else {
log_error(("could not perform giveitem::handle()\n"));
}
unused(data);
return 0;
}

View file

@ -19,9 +19,10 @@
#include <unit.h>
/* util includes */
#include <event.h>
#include <resolve.h>
#include <base36.h>
#include <util/base36.h>
#include <util/event.h>
#include <util/log.h>
#include <util/resolve.h>
#include <stdio.h>
#include <stdlib.h>
@ -38,8 +39,9 @@ killunit_handle(trigger * t, void * data)
unit * u = (unit*)t->data.v;
if (u!=NULL) {
destroy_unit(u);
} else
} else {
log_error(("could not perform killunit::handle()\n"));
}
unused(data);
return 0;
}

View file

@ -23,6 +23,7 @@
/* util includes */
#include <util/attrib.h>
#include <util/event.h>
#include <util/log.h>
#include <util/resolve.h>
#include <util/base36.h>

View file

@ -28,6 +28,7 @@
/* util includes */
#include <util/base36.h>
#include <util/event.h>
#include <util/log.h>
#include <util/resolve.h>
#include <util/rng.h>

View file

@ -27,6 +27,7 @@
#include <util/base36.h>
#include <util/goodies.h>
#include <util/language.h>
#include <util/log.h>
/* ansi includes */
#include <stdio.h>

View file

@ -0,0 +1,3 @@
#include <config.h>
#include "filereader.h"

View file

@ -34,7 +34,9 @@
/* warning C4100: <name> : unreferenced formal parameter */
# pragma warning(disable: 4996)
/* warning C4100: <name> was declared deprecated */
#define _CRT_SECURE_NO_DEPRECATE
#ifndef _CRT_SECURE_NO_DEPRECATE
# define _CRT_SECURE_NO_DEPRECATE
#endif
#endif
@ -159,6 +161,7 @@ typedef struct stat stat_type;
/* MSVC has _stat, not stat */
# define HAVE_STAT
#include <sys/stat.h>
# define stat(a, b) _stat(a, b)
typedef struct _stat stat_type;

View file

@ -1,181 +1,81 @@
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "attributes", "common\attributes\attributes.vcproj", "{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}"
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common/util.vcproj", "{EB70234E-66CF-F144-A38A-0BAE30EF826C}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea\eressea.vcproj", "{B859D542-781E-4647-BCAB-3FE5ED077366}"
ProjectSection(ProjectDependencies) = postProject
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{79659D44-EC28-42B9-9475-6C0D62D0AAE0} = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode\gamecode.vcproj", "{79659D44-EC28-42B9-9475-6C0D62D0AAE0}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common/kernel.vcproj", "{63B8EE38-7BFC-5040-BB1E-402FADE42AAB}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "items", "common\items\items.vcproj", "{C14E3D2B-8189-4570-A4E3-9010C873E4FD}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common/gamecode.vcproj", "{F020D830-7FE1-A140-A40F-F7BF0862F213}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel\kernel.vcproj", "{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bindings", "eressea/lua/bindings.vcproj", "{9EFE5212-8341-D84F-B7FC-2F10C0622637}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modules", "common\modules\modules.vcproj", "{601CF164-F483-4DE7-8014-64BDD30680B5}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmtool", "eressea/gmtool.vcproj", "{B1DBAFC8-38DC-BC45-A6F3-549F725A99A5}"
ProjectSection(ProjectDependencies) = postProject
{EB70234E-66CF-F144-A38A-0BAE30EF826C} = {EB70234E-66CF-F144-A38A-0BAE30EF826C}
{63B8EE38-7BFC-5040-BB1E-402FADE42AAB} = {63B8EE38-7BFC-5040-BB1E-402FADE42AAB}
{9EFE5212-8341-D84F-B7FC-2F10C0622637} = {9EFE5212-8341-D84F-B7FC-2F10C0622637}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "races", "common\races\races.vcproj", "{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea-lua", "eressea/eressea-lua.vcproj", "{4EABF610-0F79-C048-A66A-C0B898F40A68}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spells", "common\spells\spells.vcproj", "{0EE778AB-8445-40DB-8F65-6BE378A91B97}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "triggers", "common\triggers\triggers.vcproj", "{EF495253-2EEC-4F83-B6C0-D651F88B2198}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util\util.vcproj", "{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea-lua", "eressea\eressea-lua.vcproj", "{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}"
ProjectSection(ProjectDependencies) = postProject
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{79659D44-EC28-42B9-9475-6C0D62D0AAE0} = {79659D44-EC28-42B9-9475-6C0D62D0AAE0}
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmtool", "eressea\gmtool.vcproj", "{57BA2AEE-5C65-4839-9294-C0FA2915A06C}"
ProjectSection(ProjectDependencies) = postProject
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{C14E3D2B-8189-4570-A4E3-9010C873E4FD} = {C14E3D2B-8189-4570-A4E3-9010C873E4FD}
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
{EF495253-2EEC-4F83-B6C0-D651F88B2198} = {EF495253-2EEC-4F83-B6C0-D651F88B2198}
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
{601CF164-F483-4DE7-8014-64BDD30680B5} = {601CF164-F483-4DE7-8014-64BDD30680B5}
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211} = {EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{0EE778AB-8445-40DB-8F65-6BE378A91B97} = {0EE778AB-8445-40DB-8F65-6BE378A91B97}
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3} = {330712B5-8B27-4B17-B3CF-7A02CC0F93C3}
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00} = {4C837BEC-A428-4287-84B3-8F8F9DE7FA00}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{9569C30D-742F-4F95-9C5D-BBF2B69C0727}"
ProjectSection(ProjectDependencies) = postProject
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4} = {1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}
{EB70234E-66CF-F144-A38A-0BAE30EF826C} = {EB70234E-66CF-F144-A38A-0BAE30EF826C}
{63B8EE38-7BFC-5040-BB1E-402FADE42AAB} = {63B8EE38-7BFC-5040-BB1E-402FADE42AAB}
{F020D830-7FE1-A140-A40F-F7BF0862F213} = {F020D830-7FE1-A140-A40F-F7BF0862F213}
{9EFE5212-8341-D84F-B7FC-2F10C0622637} = {9EFE5212-8341-D84F-B7FC-2F10C0622637}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Profile = Profile
Release = Release
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Profile|Win32 = Profile|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EB70234E-66CF-F144-A38A-0BAE30EF826C}.Debug|Win32.ActiveCfg = Debug|Win32
{EB70234E-66CF-F144-A38A-0BAE30EF826C}.Debug|Win32.Build.0 = Debug|Win32
{EB70234E-66CF-F144-A38A-0BAE30EF826C}.Profile|Win32.ActiveCfg = Profile|Win32
{EB70234E-66CF-F144-A38A-0BAE30EF826C}.Profile|Win32.Build.0 = Profile|Win32
{EB70234E-66CF-F144-A38A-0BAE30EF826C}.Release|Win32.ActiveCfg = Release|Win32
{EB70234E-66CF-F144-A38A-0BAE30EF826C}.Release|Win32.Build.0 = Release|Win32
{63B8EE38-7BFC-5040-BB1E-402FADE42AAB}.Debug|Win32.ActiveCfg = Debug|Win32
{63B8EE38-7BFC-5040-BB1E-402FADE42AAB}.Debug|Win32.Build.0 = Debug|Win32
{63B8EE38-7BFC-5040-BB1E-402FADE42AAB}.Profile|Win32.ActiveCfg = Profile|Win32
{63B8EE38-7BFC-5040-BB1E-402FADE42AAB}.Profile|Win32.Build.0 = Profile|Win32
{63B8EE38-7BFC-5040-BB1E-402FADE42AAB}.Release|Win32.ActiveCfg = Release|Win32
{63B8EE38-7BFC-5040-BB1E-402FADE42AAB}.Release|Win32.Build.0 = Release|Win32
{F020D830-7FE1-A140-A40F-F7BF0862F213}.Debug|Win32.ActiveCfg = Debug|Win32
{F020D830-7FE1-A140-A40F-F7BF0862F213}.Debug|Win32.Build.0 = Debug|Win32
{F020D830-7FE1-A140-A40F-F7BF0862F213}.Profile|Win32.ActiveCfg = Profile|Win32
{F020D830-7FE1-A140-A40F-F7BF0862F213}.Profile|Win32.Build.0 = Profile|Win32
{F020D830-7FE1-A140-A40F-F7BF0862F213}.Release|Win32.ActiveCfg = Release|Win32
{F020D830-7FE1-A140-A40F-F7BF0862F213}.Release|Win32.Build.0 = Release|Win32
{9EFE5212-8341-D84F-B7FC-2F10C0622637}.Debug|Win32.ActiveCfg = Debug|Win32
{9EFE5212-8341-D84F-B7FC-2F10C0622637}.Debug|Win32.Build.0 = Debug|Win32
{9EFE5212-8341-D84F-B7FC-2F10C0622637}.Profile|Win32.ActiveCfg = Profile|Win32
{9EFE5212-8341-D84F-B7FC-2F10C0622637}.Profile|Win32.Build.0 = Profile|Win32
{9EFE5212-8341-D84F-B7FC-2F10C0622637}.Release|Win32.ActiveCfg = Release|Win32
{9EFE5212-8341-D84F-B7FC-2F10C0622637}.Release|Win32.Build.0 = Release|Win32
{B1DBAFC8-38DC-BC45-A6F3-549F725A99A5}.Debug|Win32.ActiveCfg = Debug|Win32
{B1DBAFC8-38DC-BC45-A6F3-549F725A99A5}.Debug|Win32.Build.0 = Debug|Win32
{B1DBAFC8-38DC-BC45-A6F3-549F725A99A5}.Profile|Win32.ActiveCfg = Profile|Win32
{B1DBAFC8-38DC-BC45-A6F3-549F725A99A5}.Profile|Win32.Build.0 = Profile|Win32
{B1DBAFC8-38DC-BC45-A6F3-549F725A99A5}.Release|Win32.ActiveCfg = Release|Win32
{B1DBAFC8-38DC-BC45-A6F3-549F725A99A5}.Release|Win32.Build.0 = Release|Win32
{4EABF610-0F79-C048-A66A-C0B898F40A68}.Debug|Win32.ActiveCfg = Debug|Win32
{4EABF610-0F79-C048-A66A-C0B898F40A68}.Debug|Win32.Build.0 = Debug|Win32
{4EABF610-0F79-C048-A66A-C0B898F40A68}.Profile|Win32.ActiveCfg = Profile|Win32
{4EABF610-0F79-C048-A66A-C0B898F40A68}.Profile|Win32.Build.0 = Profile|Win32
{4EABF610-0F79-C048-A66A-C0B898F40A68}.Release|Win32.ActiveCfg = Release|Win32
{4EABF610-0F79-C048-A66A-C0B898F40A68}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.ActiveCfg = Debug|Win32
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Debug.Build.0 = Debug|Win32
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Profile.ActiveCfg = Profile|Win32
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Profile.Build.0 = Profile|Win32
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Release.ActiveCfg = Release|Win32
{330712B5-8B27-4B17-B3CF-7A02CC0F93C3}.Release.Build.0 = Release|Win32
{B859D542-781E-4647-BCAB-3FE5ED077366}.Debug.ActiveCfg = Debug|Win32
{B859D542-781E-4647-BCAB-3FE5ED077366}.Debug.Build.0 = Debug|Win32
{B859D542-781E-4647-BCAB-3FE5ED077366}.Profile.ActiveCfg = Profile|Win32
{B859D542-781E-4647-BCAB-3FE5ED077366}.Profile.Build.0 = Profile|Win32
{B859D542-781E-4647-BCAB-3FE5ED077366}.Release.ActiveCfg = Release|Win32
{B859D542-781E-4647-BCAB-3FE5ED077366}.Release.Build.0 = Release|Win32
{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Debug.ActiveCfg = Debug|Win32
{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Debug.Build.0 = Debug|Win32
{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Profile.ActiveCfg = Profile|Win32
{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Profile.Build.0 = Profile|Win32
{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Release.ActiveCfg = Release|Win32
{79659D44-EC28-42B9-9475-6C0D62D0AAE0}.Release.Build.0 = Release|Win32
{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Debug.ActiveCfg = Debug|Win32
{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Debug.Build.0 = Debug|Win32
{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Profile.ActiveCfg = Profile|Win32
{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Profile.Build.0 = Profile|Win32
{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Release.ActiveCfg = Release|Win32
{C14E3D2B-8189-4570-A4E3-9010C873E4FD}.Release.Build.0 = Release|Win32
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Debug.ActiveCfg = Debug|Win32
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Debug.Build.0 = Debug|Win32
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Profile.ActiveCfg = Profile|Win32
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Profile.Build.0 = Profile|Win32
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Release.ActiveCfg = Release|Win32
{EDB0DE67-8215-4AF7-ACA1-F23CB11FF211}.Release.Build.0 = Release|Win32
{601CF164-F483-4DE7-8014-64BDD30680B5}.Debug.ActiveCfg = Debug|Win32
{601CF164-F483-4DE7-8014-64BDD30680B5}.Debug.Build.0 = Debug|Win32
{601CF164-F483-4DE7-8014-64BDD30680B5}.Profile.ActiveCfg = Profile|Win32
{601CF164-F483-4DE7-8014-64BDD30680B5}.Profile.Build.0 = Profile|Win32
{601CF164-F483-4DE7-8014-64BDD30680B5}.Release.ActiveCfg = Release|Win32
{601CF164-F483-4DE7-8014-64BDD30680B5}.Release.Build.0 = Release|Win32
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Debug.ActiveCfg = Debug|Win32
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Debug.Build.0 = Debug|Win32
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Profile.ActiveCfg = Profile|Win32
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Profile.Build.0 = Profile|Win32
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Release.ActiveCfg = Release|Win32
{4C837BEC-A428-4287-84B3-8F8F9DE7FA00}.Release.Build.0 = Release|Win32
{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Debug.ActiveCfg = Debug|Win32
{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Debug.Build.0 = Debug|Win32
{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Profile.ActiveCfg = Profile|Win32
{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Profile.Build.0 = Profile|Win32
{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Release.ActiveCfg = Release|Win32
{0EE778AB-8445-40DB-8F65-6BE378A91B97}.Release.Build.0 = Release|Win32
{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Debug.ActiveCfg = Debug|Win32
{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Debug.Build.0 = Debug|Win32
{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Profile.ActiveCfg = Profile|Win32
{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Profile.Build.0 = Profile|Win32
{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Release.ActiveCfg = Release|Win32
{EF495253-2EEC-4F83-B6C0-D651F88B2198}.Release.Build.0 = Release|Win32
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug.ActiveCfg = Debug|Win32
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Debug.Build.0 = Debug|Win32
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Profile.ActiveCfg = Profile|Win32
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Profile.Build.0 = Profile|Win32
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.ActiveCfg = Release|Win32
{1D80D05F-BCF5-4971-8F06-D9581FD3B1F4}.Release.Build.0 = Release|Win32
{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Debug.ActiveCfg = Debug|Win32
{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Debug.Build.0 = Debug|Win32
{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Profile.ActiveCfg = Profile|Win32
{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Profile.Build.0 = Profile|Win32
{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Release.ActiveCfg = Release|Win32
{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}.Release.Build.0 = Release|Win32
{57BA2AEE-5C65-4839-9294-C0FA2915A06C}.Debug.ActiveCfg = Debug|Win32
{57BA2AEE-5C65-4839-9294-C0FA2915A06C}.Debug.Build.0 = Debug|Win32
{57BA2AEE-5C65-4839-9294-C0FA2915A06C}.Profile.ActiveCfg = Profile|Win32
{57BA2AEE-5C65-4839-9294-C0FA2915A06C}.Profile.Build.0 = Profile|Win32
{57BA2AEE-5C65-4839-9294-C0FA2915A06C}.Release.ActiveCfg = Release|Win32
{57BA2AEE-5C65-4839-9294-C0FA2915A06C}.Release.Build.0 = Release|Win32
{9569C30D-742F-4F95-9C5D-BBF2B69C0727}.Debug.ActiveCfg = Debug|Win32
{9569C30D-742F-4F95-9C5D-BBF2B69C0727}.Debug.Build.0 = Debug|Win32
{9569C30D-742F-4F95-9C5D-BBF2B69C0727}.Profile.ActiveCfg = Release|Win32
{9569C30D-742F-4F95-9C5D-BBF2B69C0727}.Profile.Build.0 = Release|Win32
{9569C30D-742F-4F95-9C5D-BBF2B69C0727}.Release.ActiveCfg = Release|Win32
{9569C30D-742F-4F95-9C5D-BBF2B69C0727}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View file

@ -1,646 +1,288 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Version="8.00"
Name="eressea-lua"
ProjectGUID="{749A2F7C-B9C3-4CEB-B1B2-1D4587E68719}"
ProjectGUID="{4EABF610-0F79-C048-A66A-C0B898F40A68}"
RootNamespace="eressea-lua"
SccProjectName=""
SccLocalPath="">
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"/>
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release-lua"
IntermediateDirectory=".\Release-lua"
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="4"
EnableFunctionLevelLinking="TRUE"
DisableLanguageExtensions="FALSE"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Release/eressea-lua.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
CompileAs="0"/>
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"/>
Name="VCCustomBuildTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /FIXED:NO"
AdditionalDependencies="luabind.lib lua50.lib libxml2.lib"
OutputFile=".\Release/eressea-lua.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Release/eressea-lua.pdb"
SubSystem="1"/>
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/eressea-lua.tlb"/>
/>
<Tool
Name="VCPostBuildEventTool"/>
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;../common;../common/kernel"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1031"/>
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
AdditionalIncludeDirectories="..;../common;../common/kernel"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"/>
Name="VCLinkerTool"
AdditionalDependencies="../common/Debug/util/util.lib ../common/Debug/kernel/kernel.lib ../common/Debug/gamecode/gamecode.lib lua/Debug/bindings/bindings.lib libxml2.lib lua5.1_d.lib luabind_d.lib"
OutputFile="$(OutDir)/eressea-lua.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=".."
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/eressea-lua.pdb"
SubSystem="1"
EntryPointSymbol="mainCRTStartup"
TargetMachine="1"
/>
<Tool
Name="VCWebDeploymentTool"/>
Name="VCALinkTool"
/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
Name="VCManifestTool"
/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Profile|Win32"
OutputDirectory=".\Profile-lua"
IntermediateDirectory=".\Profile-lua"
OutputDirectory="Profile"
IntermediateDirectory="Profile"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="4"
EnableFunctionLevelLinking="TRUE"
DisableLanguageExtensions="FALSE"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Profile/eressea-lua.pch"
AssemblerListingLocation=".\Profile/"
ObjectFile=".\Profile/"
ProgramDataBaseFileName=".\Profile/"
BrowseInformation="1"
WarningLevel="4"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"/>
Name="VCCustomBuildTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="luabind.lib lua50.lib libxml2.lib"
OutputFile=".\Profile/eressea-lua.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="TRUE"
SubSystem="1"/>
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Profile/eressea-lua.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1031"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug-lua"
IntermediateDirectory=".\Debug-lua"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
PreprocessorDefinitions="_CONSOLE,WIN32"
StringPooling="TRUE"
AdditionalIncludeDirectories="..;../common;../common/kernel"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="4"
BufferSecurityCheck="TRUE"
DisableLanguageExtensions="FALSE"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Debug/eressea-lua.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
CompileAs="0"
DisableSpecificWarnings="4505"/>
/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="luabind.lib lua50.lib libxml2.lib"
OutputFile=".\Debug/eressea-lua.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/eressea-lua.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Debug/eressea-lua.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1031"/>
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
AdditionalIncludeDirectories="..;../common;../common/kernel"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"/>
Name="VCLinkerTool"
AdditionalDependencies="../common/Profile/util/util.lib ../common/Profile/kernel/kernel.lib ../common/Profile/gamecode/gamecode.lib lua/Profile/bindings/bindings.lib libxml2.lib lua5.1.lib luabind.lib"
OutputFile="$(OutDir)/eressea-lua.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=".."
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/eressea-lua.pdb"
SubSystem="1"
EntryPointSymbol="mainCRTStartup"
TargetMachine="1"
/>
<Tool
Name="VCWebDeploymentTool"/>
Name="VCALinkTool"
/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
Name="VCManifestTool"
/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release64|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
Optimization="3"
AdditionalIncludeDirectories="..;../common;../common/kernel"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
DisableLanguageExtensions="FALSE"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/eressea-lua.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
DebugInformationFormat="3"
CompileAs="0"/>
Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
/>
<Tool
Name="VCCustomBuildTool"/>
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
AdditionalIncludeDirectories="..;../common;../common/kernel"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:AMD64 /FIXED:NO"
AdditionalDependencies="luabind.lib lua50.lib libxml2.lib"
OutputFile=".\Release/eressea-lua.exe"
AdditionalDependencies="../common/Release/util/util.lib ../common/Release/kernel/kernel.lib ../common/Release/gamecode/gamecode.lib lua/Release/bindings/bindings.lib libxml2.lib lua5.1.lib luabind.lib"
OutputFile="$(OutDir)/eressea-lua.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Release/eressea-lua.pdb"
SubSystem="1"/>
AdditionalLibraryDirectories=".."
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
EntryPointSymbol="mainCRTStartup"
TargetMachine="1"
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/eressea-lua.tlb"/>
Name="VCALinkTool"
/>
<Tool
Name="VCPostBuildEventTool"/>
Name="VCManifestTool"
/>
<Tool
Name="VCPreBuildEventTool"/>
Name="VCXDCMakeTool"
/>
<Tool
Name="VCPreLinkEventTool"/>
Name="VCBscMakeTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1031"/>
Name="VCFxCopTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
Name="VCAppVerifierTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"/>
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug64|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
ImproveFloatingPointConsistency="FALSE"
AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
PreprocessorDefinitions="_CONSOLE,WIN32"
StringPooling="TRUE"
BasicRuntimeChecks="0"
BufferSecurityCheck="FALSE"
DisableLanguageExtensions="FALSE"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Debug/eressea-lua.pch"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
CompileAs="0"
DisableSpecificWarnings="4505"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="luabindd.lib lua50.lib libxml2.lib"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrt.lib, libcmtd.lib, msvcrtd.lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/eressea-lua.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Debug/eressea-lua.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1031"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Text Files"
Filter="">
<File
RelativePath="..\header.txt">
</File>
<File
RelativePath="..\todo.txt">
</File>
</Filter>
<Filter
Name="bindings"
Filter="">
<File
RelativePath=".\lua\alliance.cpp">
</File>
<File
RelativePath=".\lua\bindings.h">
</File>
<File
RelativePath=".\lua\building.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Release64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
</File>
<File
RelativePath=".\lua\eressea.cpp">
</File>
<File
RelativePath=".\lua\event.cpp">
</File>
<File
RelativePath=".\lua\faction.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Release64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
</File>
<File
RelativePath=".\lua\gamecode.cpp">
</File>
<File
RelativePath=".\lua\item.cpp">
</File>
<File
RelativePath=".\lua\list.h">
</File>
<File
RelativePath=".\lua\message.cpp">
</File>
<File
RelativePath=".\lua\objects.cpp">
</File>
<File
RelativePath=".\lua\objects.h">
</File>
<File
RelativePath=".\lua\region.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Release64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
</File>
<File
RelativePath=".\lua\script.cpp">
</File>
<File
RelativePath=".\lua\script.h">
</File>
<File
RelativePath=".\lua\ship.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Release64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
</File>
<File
RelativePath=".\lua\spell.cpp">
</File>
<File
RelativePath=".\lua\unit.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Release64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
</File>
</Filter>
<File
RelativePath=".\korrektur.c">
</File>
<File
RelativePath=".\server.cpp">
</File>
<File
RelativePath=".\console.c">
</File>
<File
RelativePath=".\console.h">
</File>
<File
RelativePath="..\common\iniparser\iniparser.c">
</File>
<File
RelativePath="..\common\iniparser\iniparser.h">
</File>
<File
RelativePath=".\korrektur.c">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="TRUE"/>
</FileConfiguration>
<FileConfiguration
Name="Release64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="TRUE"/>
</FileConfiguration>
</File>
<File
RelativePath=".\korrektur.h">
</File>
<File
RelativePath=".\server.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Debug64|Win32">
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="FALSE"/>
</FileConfiguration>
</File>
<File
RelativePath="..\common\settings-eressea.h">
</File>
<File
RelativePath="..\common\settings-tutorial.h">
</File>
<File
RelativePath="..\common\settings-vinyambar-3.h">
</File>
<File
RelativePath="..\common\settings-vinyambar-4.h">
</File>
<File
RelativePath="..\common\settings-vinyambar-classic.h">
</File>
<File
RelativePath="..\common\settings-vinyambar.h">
</File>
<File
RelativePath="..\common\settings-wdw.h">
</File>
<File
RelativePath="..\common\settings.h">
</File>
</Files>
<Globals>
</Globals>

View file

@ -213,7 +213,6 @@ game_init(void)
init_triggers();
init_xmas();
register_races();
register_names();
register_resources();
register_buildings();
@ -241,8 +240,6 @@ game_init(void)
/* init_resources(); must be done inside the xml-read, because requirements use items */
init_attributes();
init_races();
init_itemtypes();
init_rawmaterials();
init_gmcmd();

View file

@ -1,292 +1,312 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Version="8.00"
Name="gmtool"
ProjectGUID="{57BA2AEE-5C65-4839-9294-C0FA2915A06C}"
SccProjectName=""
SccLocalPath="">
ProjectGUID="{B1DBAFC8-38DC-BC45-A6F3-549F725A99A5}"
RootNamespace="gmtool"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"/>
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
CharacterSet="2"
>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="4"
EnableFunctionLevelLinking="TRUE"
DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Release/gmtool.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="1"/>
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"/>
Name="VCCustomBuildTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="curses.lib libxml2.lib"
OutputFile=".\Release/gmtool.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Release/gmtool.pdb"
SubSystem="1"/>
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/gmtool.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1031"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
ImproveFloatingPointConsistency="TRUE"
AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
PreprocessorDefinitions="_CONSOLE,WIN32"
AdditionalIncludeDirectories="..;../common;../common/kernel"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="4"
BufferSecurityCheck="TRUE"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Debug/gmtool.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
CompileAs="0"/>
/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="luabind.lib lua50.lib curses.lib libxml2.lib"
OutputFile=".\Debug/gmtool.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/gmtool.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Debug/gmtool.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1031"/>
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
AdditionalIncludeDirectories="..;../common;../common/kernel"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"/>
Name="VCLinkerTool"
AdditionalDependencies="../common/Debug/util/util.lib ../common/Debug/kernel/kernel.lib lua/Debug/bindings/bindings.lib libxml2.lib curses.lib lua5.1_d.lib luabind_d.lib"
OutputFile="$(OutDir)/gmtool.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=".."
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/gmtool.pdb"
SubSystem="1"
EntryPointSymbol="mainCRTStartup"
TargetMachine="1"
/>
<Tool
Name="VCWebDeploymentTool"/>
Name="VCALinkTool"
/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
Name="VCManifestTool"
/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Profile|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="Profile"
IntermediateDirectory="Profile"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="4"
EnableFunctionLevelLinking="TRUE"
DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Release/gmtool.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
AdditionalIncludeDirectories="..;../common;../common/kernel"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="1"/>
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="curses.lib libxml2.lib"
OutputFile=".\Release/gmtool.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Release/gmtool.pdb"
SubSystem="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/gmtool.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1031"/>
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
AdditionalIncludeDirectories="..;../common;../common/kernel"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"/>
Name="VCLinkerTool"
AdditionalDependencies="../common/Profile/util/util.lib ../common/Profile/kernel/kernel.lib lua/Profile/bindings/bindings.lib libxml2.lib curses.lib lua5.1.lib luabind.lib"
OutputFile="$(OutDir)/gmtool.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=".."
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/gmtool.pdb"
SubSystem="1"
EntryPointSymbol="mainCRTStartup"
TargetMachine="1"
/>
<Tool
Name="VCWebDeploymentTool"/>
Name="VCALinkTool"
/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
Name="VCManifestTool"
/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="3"
AdditionalIncludeDirectories="..;../common;../common/kernel"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="4"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
AdditionalIncludeDirectories="..;../common;../common/kernel"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="../common/Release/util/util.lib ../common/Release/kernel/kernel.lib lua/Release/bindings/bindings.lib libxml2.lib curses.lib lua5.1.lib luabind.lib"
OutputFile="$(OutDir)/gmtool.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=".."
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
EntryPointSymbol="mainCRTStartup"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Header"
Filter="*.h">
<File
RelativePath=".\editing.h">
</File>
<File
RelativePath=".\gmtool.h">
</File>
<File
RelativePath=".\gmtool_structs.h">
</File>
Name="curses"
Filter=""
>
<File
RelativePath=".\curses\listbox.h">
</File>
<File
RelativePath=".\curses\listbox.c">
</File>
</Filter>
<Filter
Name="bindings">
<File
RelativePath=".\lua\alliance.cpp">
</File>
<File
RelativePath=".\lua\bindings.h">
</File>
<File
RelativePath=".\lua\building.cpp">
</File>
<File
RelativePath=".\lua\eressea.cpp">
</File>
<File
RelativePath=".\lua\faction.cpp">
</File>
Name="lua"
Filter=""
>
<File
RelativePath=".\lua\gm.cpp">
</File>
<File
RelativePath=".\lua\item.cpp">
</File>
<File
RelativePath=".\lua\list.h">
</File>
<File
RelativePath=".\lua\objects.cpp">
</File>
<File
RelativePath=".\lua\objects.h">
</File>
<File
RelativePath=".\lua\region.cpp">
</File>
<File
RelativePath=".\lua\ship.cpp">
</File>
<File
RelativePath=".\lua\spell.cpp">
</File>
<File
RelativePath=".\lua\unit.cpp">
</File>
</Filter>
<File
RelativePath=".\console.c">
</File>
<File
RelativePath=".\editing.c">
</File>
<File
RelativePath=".\gmmain.cpp">
RelativePath=".\gmtool.h">
</File>
<File
RelativePath=".\gmtool.c">
</File>
<File
RelativePath="..\common\iniparser\iniparser.c">
RelativePath=".\editing.c">
</File>
<File
RelativePath="..\common\iniparser\iniparser.h">
RelativePath=".\editing.h">
</File>
<File
RelativePath=".\curses\listbox.c">
RelativePath=".\gmmain.cpp">
</File>
<File
RelativePath=".\console.c">
</File>
</Files>
<Globals>

View file

@ -30,6 +30,7 @@
#include <util/attrib.h>
#include <util/language.h>
#include <util/lists.h>
#include <util/log.h>
#include <util/base36.h>
#include <util/rand.h>
#include <util/rng.h>

View file

@ -38,6 +38,7 @@
// util includes
#include <util/lists.h>
#include <util/log.h>
#include <util/language.h>
#include <util/base36.h>
#include <util/rand.h>

View file

@ -11,6 +11,7 @@
// util includes
#include <util/attrib.h>
#include <util/functions.h>
#include <util/log.h>
// lua includes
#include <lua.hpp>

View file

@ -14,6 +14,7 @@
#include <kernel/unit.h>
#include <util/attrib.h>
#include <util/log.h>
#include <attributes/key.h>

View file

@ -29,6 +29,7 @@
// util includes
#include <util/attrib.h>
#include <util/functions.h>
#include <util/log.h>
#include <luabind/luabind.hpp>
#include <luabind/object.hpp>

View file

@ -29,6 +29,7 @@
#include <util/base36.h>
#include <util/event.h>
#include <util/lists.h>
#include <util/log.h>
// lua includes
#include <lua.hpp>

View file

@ -36,6 +36,7 @@
#include <gamecode/spells.h>
#include <triggers/triggers.h>
#include <items/itemtypes.h>
#include <races/races.h>
/* modules includes */
#include <modules/xmas.h>
@ -250,7 +251,6 @@ game_init(void)
init_archetypes();
init_attributes();
init_races();
init_itemtypes();
init_rawmaterials();

150
src/premake.lua Normal file
View file

@ -0,0 +1,150 @@
project.name = "eressea"
project.configs = { "Debug", "Profile", "Release" }
package = newpackage()
package.name = "util"
package.kind = "lib"
package.language = "c"
package.path = "common"
package.includepaths = { "..", ".", "util" }
package.files = matchfiles("../config.h", "settings.h", "util/*.c", "util/*.h", "iniparser/*.c", "iniparser/*.h")
package.excludes = { "util/strncpy.c" }
for k,v in project.configs do
package.config[v].objdir = v .. "/" .. package.name
package.config[v].libdir = v .. "/" .. package.name
table.insert(package.config[v].buildflags, "extra-warnings")
if (windows) then
table.insert(package.config[v].defines, "WIN32")
table.insert(package.config[v].defines, "_CRT_SECURE_NO_DEPRECATE")
end
if v=="Release" then
table.insert(package.config[v].defines, "NDEBUG")
end
end
package = newpackage()
package.name = "kernel"
package.kind = "lib"
package.language = "c"
package.path = "common"
package.includepaths = { "..", ".", "kernel", "util" }
package.files = matchfiles("kernel/*.c", "triggers/*.c", "spells/*.c", "items/*.c", "kernel/*.h", "triggers/*.h", "spells/*.h", "items/*.h", "modules/*.h", "modules/*.c", "attributes/*.h", "attributes/*.c")
package.excludes = {
"modules/victoryconditions.c",
"modules/victoryconditions.h",
"items/studypotion.c",
"items/studypotion.h"
}
for k,v in project.configs do
package.config[v].objdir = v .. "/" .. package.name
package.config[v].libdir = v .. "/" .. package.name
table.insert(package.config[v].buildflags, "extra-warnings")
if (windows) then
table.insert(package.config[v].defines, "WIN32")
table.insert(package.config[v].defines, "_CRT_SECURE_NO_DEPRECATE")
end
if v=="Release" then
table.insert(package.config[v].defines, "NDEBUG")
end
end
package = newpackage()
package.name = "gamecode"
package.kind = "lib"
package.language = "c"
package.path = "common"
package.includepaths = { "..", ".", "kernel", "util" }
package.files = matchfiles("gamecode/*.c", "races/*.c", "gamecode/*.h", "races/*.h")
for k,v in project.configs do
package.config[v].objdir = v .. "/" .. package.name
package.config[v].libdir = v .. "/" .. package.name
table.insert(package.config[v].buildflags, "extra-warnings")
if (windows) then
table.insert(package.config[v].defines, "WIN32")
table.insert(package.config[v].defines, "_CRT_SECURE_NO_DEPRECATE")
end
if v=="Release" then
table.insert(package.config[v].defines, "NDEBUG")
end
end
package = newpackage()
package.name = "bindings"
package.kind = "lib"
package.language = "c++"
package.path = "eressea/lua"
package.includepaths = { "../..", "../../common", "../../common/kernel" }
package.files = matchfiles("*.cpp", "*.h")
package.excludes = { "gm.cpp" }
for k,v in project.configs do
package.config[v].objdir = v .. "/" .. package.name
package.config[v].libdir = v .. "/" .. package.name
table.insert(package.config[v].buildflags, "extra-warnings")
if (windows) then
table.insert(package.config[v].defines, "WIN32")
table.insert(package.config[v].defines, "_CRT_SECURE_NO_DEPRECATE")
end
if v=="Release" then
table.insert(package.config[v].defines, "NDEBUG")
end
end
package = newpackage()
package.name = "gmtool"
package.kind = "exe"
package.language = "c++"
package.path = "eressea"
package.includepaths = { "..", "../common", "../common/kernel" }
package.files = { "gmtool.h", "gmtool.c", "editing.c", "editing.h", "gmmain.cpp", "console.c", "curses/listbox.h", "curses/listbox.c", "lua/gm.cpp" }
package.links = { "util", "kernel", "bindings", "libxml2", "curses" }
for k,v in project.configs do
package.config[v].objdir = v
package.config[v].bindir = v
table.insert(package.config[v].buildflags, "extra-warnings")
if (windows) then
table.insert(package.config[v].defines, "WIN32")
table.insert(package.config[v].defines, "_CRT_SECURE_NO_DEPRECATE")
end
if v=="Debug" then
package.config[v].links = { "lua5.1_d", "luabind_d" }
else
package.config[v].links = { "lua5.1", "luabind" }
if v=="Release" then
table.insert(package.config[v].defines, "NDEBUG")
end
end
end
package = newpackage()
package.name = "eressea-lua"
package.kind = "exe"
package.language = "c++"
package.path = "eressea"
package.includepaths = { "..", "../common", "../common/kernel" }
package.files = { "korrektur.c", "server.cpp", "console.c", "console.h" }
package.links = { "util", "kernel", "gamecode", "bindings", "libxml2" }
for k,v in project.configs do
package.config[v].objdir = v
package.config[v].bindir = v
table.insert(package.config[v].buildflags, "extra-warnings")
if (windows) then
table.insert(package.config[v].defines, "WIN32")
table.insert(package.config[v].defines, "_CRT_SECURE_NO_DEPRECATE")
end
if v=="Debug" then
package.config[v].links = { "lua5.1_d", "luabind_d" }
else
package.config[v].links = { "lua5.1", "luabind" }
if v=="Release" then
table.insert(package.config[v].defines, "NDEBUG")
end
end
-- package.config["Debug"].linkoptions = { "/NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMT" }
end
-- kernel: util, triggers, attributes, spells, items
-- gamecode: races