From a7ad6adce1d0b1e9dae9640921d2baf4576254a4 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 20 Feb 2010 08:31:56 +0000
Subject: [PATCH] fixed the unity build (somewhat) renamed config.h ->
platform.h forced to change a lot of includes
---
src/common/attributes/alliance.c | 2 +-
src/common/attributes/attributes.c | 2 +-
src/common/attributes/fleechance.c | 2 +-
src/common/attributes/follow.c | 2 +-
src/common/attributes/giveitem.c | 2 +-
src/common/attributes/gm.c | 2 +-
src/common/attributes/hate.c | 2 +-
src/common/attributes/iceberg.c | 2 +-
src/common/attributes/key.c | 2 +-
src/common/attributes/matmod.c | 2 +-
src/common/attributes/moved.c | 2 +-
src/common/attributes/movement.c | 2 +-
src/common/attributes/object.c | 2 +-
src/common/attributes/option.c | 2 +-
src/common/attributes/orcification.c | 2 +-
src/common/attributes/otherfaction.c | 2 +-
src/common/attributes/overrideroads.c | 2 +-
src/common/attributes/racename.c | 2 +-
src/common/attributes/raceprefix.c | 2 +-
src/common/attributes/reduceproduction.c | 2 +-
src/common/attributes/targetregion.c | 2 +-
src/common/attributes/variable.c | 2 +-
src/common/attributes/viewrange.c | 2 +-
src/common/bindings/bind_attrib.c | 2 +-
src/common/bindings/bind_building.c | 2 +-
src/common/bindings/bind_faction.c | 2 +-
src/common/bindings/bind_gmtool.c | 4 +-
src/common/bindings/bind_hashtable.c | 2 +-
src/common/bindings/bind_message.c | 2 +-
src/common/bindings/bind_region.c | 2 +-
src/common/bindings/bind_ship.c | 2 +-
src/common/bindings/bind_sqlite.c | 2 +-
src/common/bindings/bind_storage.c | 2 +-
src/common/bindings/bind_unit.c | 2 +-
src/common/bindings/bindings.c | 10 +-
src/common/bindings/helpers.c | 2 +-
src/common/build/Jamfile | 2 +-
src/common/build/curses.c | 7 +-
src/common/build/{main.c => external.c} | 3 +-
src/common/build/gamecode.c | 177 ++-
src/common/build/kernel.c | 104 +-
src/common/build/stdafx.h | 2 +-
src/common/build/util.c | 62 +-
src/common/editing.c | 2 +-
src/common/gamecode.vcproj | 67 --
src/common/gamecode/archetype.c | 2 +-
src/common/gamecode/creation.c | 2 +-
src/common/gamecode/creport.c | 2 +-
src/common/gamecode/economy.c | 2 +-
src/common/gamecode/give.c | 2 +-
src/common/gamecode/items.c | 2 +-
src/common/gamecode/laws.c | 2 +-
src/common/gamecode/luck.c | 2 +-
src/common/gamecode/market.c | 2 +-
src/common/gamecode/monster.c | 2 +-
src/common/gamecode/randenc.c | 2 +-
src/common/gamecode/report.c | 2 +-
src/common/gamecode/spells.c | 2 +-
src/common/gamecode/spy.c | 2 +-
src/common/gamecode/study.c | 2 +-
src/common/gamecode/summary.c | 4 +-
src/common/gamecode/xmlreport.c | 2 +-
src/common/gmtool.c | 8 +-
src/common/items/artrewards.c | 2 +-
src/common/items/demonseye.c | 2 +-
src/common/items/itemtypes.c | 2 +-
src/common/items/phoenixcompass.c | 2 +-
src/common/items/seed.c | 2 +-
src/common/items/speedsail.c | 2 +-
src/common/items/weapons.c | 2 +-
src/common/items/xerewards.c | 2 +-
src/common/kernel.vcproj | 67 --
src/common/kernel/alchemy.c | 2 +-
src/common/kernel/alliance.c | 2 +-
src/common/kernel/battle.c | 2 +-
src/common/kernel/binarystore.c | 2 +-
src/common/kernel/build.c | 2 +-
src/common/kernel/building.c | 2 +-
src/common/kernel/calendar.c | 2 +-
src/common/kernel/command.c | 2 +-
src/common/kernel/connection.c | 2 +-
src/common/kernel/curse.c | 2 +-
src/common/kernel/equipment.c | 2 +-
src/common/kernel/eressea.c | 2 +-
src/common/kernel/eressea.h | 2 +-
src/common/kernel/faction.c | 2 +-
src/common/kernel/group.c | 2 +-
src/common/kernel/item.c | 2 +-
src/common/kernel/karma.c | 2 +-
src/common/kernel/magic.c | 2 +-
src/common/kernel/message.c | 2 +-
src/common/kernel/move.c | 2 +-
src/common/kernel/names.c | 2 +-
src/common/kernel/order.c | 2 +-
src/common/kernel/pathfinder.c | 2 +-
src/common/kernel/plane.c | 2 +-
src/common/kernel/player.c | 2 +-
src/common/kernel/pool.c | 2 +-
src/common/kernel/race.c | 2 +-
src/common/kernel/region.c | 2 +-
src/common/kernel/reports.c | 2 +-
src/common/kernel/resources.c | 2 +-
src/common/kernel/save.c | 2 +-
src/common/kernel/ship.c | 2 +-
src/common/kernel/skill.c | 2 +-
src/common/kernel/spell.c | 2 +-
src/common/kernel/sqlite.c | 2 +-
src/common/kernel/teleport.c | 2 +-
src/common/kernel/terrain.c | 2 +-
src/common/kernel/textstore.c | 2 +-
src/common/kernel/types.h | 2 +-
src/common/kernel/unit.c | 2 +-
src/common/kernel/xmlreader.c | 2 +-
.../lua-bindings.vcproj} | 124 +-
src/common/modules/arena.c | 2 +-
src/common/modules/autoseed.c | 2 +-
src/common/modules/dungeon.c | 2 +-
src/common/modules/gmcmd.c | 2 +-
src/common/modules/infocmd.c | 2 +-
src/common/modules/museum.c | 2 +-
src/common/modules/oceannames.c | 2 +-
src/common/modules/score.c | 2 +-
src/common/modules/weather.c | 2 +-
src/common/modules/wormhole.c | 2 +-
src/common/modules/xecmd.c | 2 +-
src/common/modules/xmas.c | 2 +-
src/common/races/dragons.c | 2 +-
src/common/races/illusion.c | 2 +-
src/common/races/races.c | 2 +-
src/common/races/zombies.c | 2 +-
.../editor.vcproj => common/server.vcproj} | 86 +-
src/common/settings-conquest.h | 53 -
src/common/settings-tutorial.h | 57 -
src/common/settings-vinyambar-3.h | 35 -
src/common/settings-vinyambar-murder.h | 42 -
src/common/settings-wdw.h | 51 -
src/common/{settings-eressea.h => settings.h} | 0
src/common/spells/alp.c | 2 +-
src/common/spells/buildingcurse.c | 2 +-
src/common/spells/combatspells.c | 2 +-
src/common/spells/regioncurse.c | 2 +-
src/common/spells/shipcurse.c | 2 +-
src/common/spells/spells.c | 2 +-
src/common/spells/unitcurse.c | 2 +-
src/common/triggers/changefaction.c | 2 +-
src/common/triggers/changerace.c | 2 +-
src/common/triggers/clonedied.c | 2 +-
src/common/triggers/createcurse.c | 2 +-
src/common/triggers/createunit.c | 2 +-
src/common/triggers/gate.c | 2 +-
src/common/triggers/giveitem.c | 2 +-
src/common/triggers/killunit.c | 2 +-
src/common/triggers/removecurse.c | 2 +-
src/common/triggers/shock.c | 2 +-
src/common/triggers/timeout.c | 2 +-
src/common/triggers/triggers.c | 2 +-
src/common/triggers/unguard.c | 2 +-
src/common/triggers/unitmessage.c | 2 +-
src/common/util.vcproj | 301 ++---
src/common/util/attrib.c | 2 +-
src/common/util/base36.c | 2 +-
src/common/util/bsdstring.c | 2 +-
src/common/util/console.c | 2 +-
src/common/util/crmessage.c | 2 +-
src/common/util/cvector.c | 2 +-
src/common/util/dice.c | 2 +-
src/common/util/event.c | 2 +-
src/common/util/eventbus.c | 2 +-
src/common/util/filereader.c | 2 +-
src/common/util/functions.c | 2 +-
src/common/util/goodies.c | 2 +-
src/common/util/language.c | 2 +-
src/common/util/listbox.c | 4 +-
src/common/util/lists.c | 2 +-
src/common/util/log.c | 2 +-
src/common/util/message.c | 2 +-
src/common/util/nrmessage.c | 2 +-
src/common/util/parser.c | 2 +-
src/common/util/patricia.c | 2 +-
src/common/util/rand.c | 2 +-
src/common/util/resolve.c | 2 +-
src/common/util/sql.c | 2 +-
src/common/util/strings.c | 2 +-
src/common/util/translation.c | 2 +-
src/common/util/umlaut.c | 2 +-
src/common/util/unicode.c | 2 +-
src/common/util/xml.c | 2 +-
src/eressea.sln | 38 +-
src/{eressea.vcproj => eressea/build.vcproj} | 58 +-
src/eressea/editor.vcproj | 255 ----
src/eressea/eressea-lua.vcproj | 439 -------
src/eressea/server.c | 31 +-
.../util/dl => external/dlmalloc}/malloc.c | 0
.../util/dl => external/dlmalloc}/malloc.h | 0
.../iniparser/iniparser.c | 2 +-
.../iniparser/iniparser.h | 0
src/{common/util => external}/mt19937ar.c | 0
src/external/sqlite3.c | 2 +-
src/{common/config.h => platform.h} | 0
src/stdafx.h | 21 -
src/vc9/bindings.vcproj | 242 ----
src/vc9/codegen.vcproj | 205 ----
src/vc9/eressea.sln | 54 -
src/vc9/eressea.vcproj | 306 -----
src/vc9/gamecode.vcproj | 326 ------
src/vc9/kernel.vcproj | 1030 -----------------
src/vc9/util.vcproj | 402 -------
207 files changed, 628 insertions(+), 4381 deletions(-)
rename src/common/build/{main.c => external.c} (75%)
rename src/{vc9/eressea-lua.vcproj => common/lua-bindings.vcproj} (67%)
rename src/{vc9/editor.vcproj => common/server.vcproj} (71%)
delete mode 100644 src/common/settings-conquest.h
delete mode 100644 src/common/settings-tutorial.h
delete mode 100644 src/common/settings-vinyambar-3.h
delete mode 100644 src/common/settings-vinyambar-murder.h
delete mode 100644 src/common/settings-wdw.h
rename src/common/{settings-eressea.h => settings.h} (100%)
rename src/{eressea.vcproj => eressea/build.vcproj} (78%)
delete mode 100644 src/eressea/editor.vcproj
delete mode 100644 src/eressea/eressea-lua.vcproj
rename src/{common/util/dl => external/dlmalloc}/malloc.c (100%)
rename src/{common/util/dl => external/dlmalloc}/malloc.h (100%)
rename src/{common => external}/iniparser/iniparser.c (99%)
rename src/{common => external}/iniparser/iniparser.h (100%)
rename src/{common/util => external}/mt19937ar.c (100%)
rename src/{common/config.h => platform.h} (100%)
delete mode 100644 src/stdafx.h
delete mode 100644 src/vc9/bindings.vcproj
delete mode 100644 src/vc9/codegen.vcproj
delete mode 100644 src/vc9/eressea.sln
delete mode 100644 src/vc9/eressea.vcproj
delete mode 100644 src/vc9/gamecode.vcproj
delete mode 100644 src/vc9/kernel.vcproj
delete mode 100644 src/vc9/util.vcproj
diff --git a/src/common/attributes/alliance.c b/src/common/attributes/alliance.c
index a88cc9e5a..7b19e4e44 100644
--- a/src/common/attributes/alliance.c
+++ b/src/common/attributes/alliance.c
@@ -9,7 +9,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/types.h>
#include "alliance.h"
diff --git a/src/common/attributes/attributes.c b/src/common/attributes/attributes.c
index db4572797..539a487ea 100644
--- a/src/common/attributes/attributes.c
+++ b/src/common/attributes/attributes.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "attributes.h"
diff --git a/src/common/attributes/fleechance.c b/src/common/attributes/fleechance.c
index 5101af05c..b85dfdd0a 100644
--- a/src/common/attributes/fleechance.c
+++ b/src/common/attributes/fleechance.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "fleechance.h"
#include <util/attrib.h>
diff --git a/src/common/attributes/follow.c b/src/common/attributes/follow.c
index 814c7e2c4..5b56c6e68 100644
--- a/src/common/attributes/follow.c
+++ b/src/common/attributes/follow.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "follow.h"
#include <kernel/eressea.h>
diff --git a/src/common/attributes/giveitem.c b/src/common/attributes/giveitem.c
index 04f980d31..b8dfe2950 100644
--- a/src/common/attributes/giveitem.c
+++ b/src/common/attributes/giveitem.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "giveitem.h"
#include <kernel/eressea.h>
diff --git a/src/common/attributes/gm.c b/src/common/attributes/gm.c
index e3bec9010..4c0f8b86b 100644
--- a/src/common/attributes/gm.c
+++ b/src/common/attributes/gm.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "gm.h"
diff --git a/src/common/attributes/hate.c b/src/common/attributes/hate.c
index 67c517fe5..3eed4331b 100644
--- a/src/common/attributes/hate.c
+++ b/src/common/attributes/hate.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "hate.h"
diff --git a/src/common/attributes/iceberg.c b/src/common/attributes/iceberg.c
index dd19b1e1c..d0e3b5588 100644
--- a/src/common/attributes/iceberg.c
+++ b/src/common/attributes/iceberg.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "iceberg.h"
diff --git a/src/common/attributes/key.c b/src/common/attributes/key.c
index 62180f279..8bd1b1b2c 100644
--- a/src/common/attributes/key.c
+++ b/src/common/attributes/key.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "key.h"
diff --git a/src/common/attributes/matmod.c b/src/common/attributes/matmod.c
index af236818e..3c81e7a42 100644
--- a/src/common/attributes/matmod.c
+++ b/src/common/attributes/matmod.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "matmod.h"
#include <util/attrib.h>
diff --git a/src/common/attributes/moved.c b/src/common/attributes/moved.c
index 635af4992..90454c607 100644
--- a/src/common/attributes/moved.c
+++ b/src/common/attributes/moved.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "moved.h"
diff --git a/src/common/attributes/movement.c b/src/common/attributes/movement.c
index 23d968c37..f809b8431 100644
--- a/src/common/attributes/movement.c
+++ b/src/common/attributes/movement.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "movement.h"
diff --git a/src/common/attributes/object.c b/src/common/attributes/object.c
index aa5eef22e..9cf099b01 100644
--- a/src/common/attributes/object.c
+++ b/src/common/attributes/object.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "object.h"
diff --git a/src/common/attributes/option.c b/src/common/attributes/option.c
index 30f9bc820..90aeeef58 100644
--- a/src/common/attributes/option.c
+++ b/src/common/attributes/option.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "option.h"
diff --git a/src/common/attributes/orcification.c b/src/common/attributes/orcification.c
index a74d787c7..0130b7655 100644
--- a/src/common/attributes/orcification.c
+++ b/src/common/attributes/orcification.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "orcification.h"
diff --git a/src/common/attributes/otherfaction.c b/src/common/attributes/otherfaction.c
index dd7ef4e2c..bf1694324 100644
--- a/src/common/attributes/otherfaction.c
+++ b/src/common/attributes/otherfaction.c
@@ -11,7 +11,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "otherfaction.h"
diff --git a/src/common/attributes/overrideroads.c b/src/common/attributes/overrideroads.c
index ef8c230ed..30534c848 100644
--- a/src/common/attributes/overrideroads.c
+++ b/src/common/attributes/overrideroads.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "overrideroads.h"
diff --git a/src/common/attributes/racename.c b/src/common/attributes/racename.c
index f0ea212f7..2680c0488 100644
--- a/src/common/attributes/racename.c
+++ b/src/common/attributes/racename.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "racename.h"
diff --git a/src/common/attributes/raceprefix.c b/src/common/attributes/raceprefix.c
index 8b47f29b5..2dd24d88b 100644
--- a/src/common/attributes/raceprefix.c
+++ b/src/common/attributes/raceprefix.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "raceprefix.h"
#include <kernel/save.h>
diff --git a/src/common/attributes/reduceproduction.c b/src/common/attributes/reduceproduction.c
index 38d64948d..9e1852494 100644
--- a/src/common/attributes/reduceproduction.c
+++ b/src/common/attributes/reduceproduction.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "reduceproduction.h"
#include <kernel/save.h>
diff --git a/src/common/attributes/targetregion.c b/src/common/attributes/targetregion.c
index 1f8eea157..4ae8d65d5 100644
--- a/src/common/attributes/targetregion.c
+++ b/src/common/attributes/targetregion.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "targetregion.h"
#include <kernel/eressea.h>
diff --git a/src/common/attributes/variable.c b/src/common/attributes/variable.c
index 32ee7dcad..5563e403d 100644
--- a/src/common/attributes/variable.c
+++ b/src/common/attributes/variable.c
@@ -10,7 +10,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "variable.h"
diff --git a/src/common/attributes/viewrange.c b/src/common/attributes/viewrange.c
index 7bee132bd..a988be6ca 100644
--- a/src/common/attributes/viewrange.c
+++ b/src/common/attributes/viewrange.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "viewrange.h"
/* util includes */
diff --git a/src/common/bindings/bind_attrib.c b/src/common/bindings/bind_attrib.c
index e72ce2dc6..038563dd9 100644
--- a/src/common/bindings/bind_attrib.c
+++ b/src/common/bindings/bind_attrib.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "bind_attrib.h"
#include <kernel/eressea.h>
diff --git a/src/common/bindings/bind_building.c b/src/common/bindings/bind_building.c
index da0f4b704..f34dfb3b0 100644
--- a/src/common/bindings/bind_building.c
+++ b/src/common/bindings/bind_building.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "bind_building.h"
#include "bind_unit.h"
diff --git a/src/common/bindings/bind_faction.c b/src/common/bindings/bind_faction.c
index 5bb69b59b..6870eaea6 100644
--- a/src/common/bindings/bind_faction.c
+++ b/src/common/bindings/bind_faction.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "bind_faction.h"
#include "bind_unit.h"
#include "bindings.h"
diff --git a/src/common/bindings/bind_gmtool.c b/src/common/bindings/bind_gmtool.c
index f85199087..3385b66c7 100644
--- a/src/common/bindings/bind_gmtool.c
+++ b/src/common/bindings/bind_gmtool.c
@@ -1,10 +1,10 @@
-#include <config.h>
+#include <platform.h>
#include <curses.h>
#include "bind_gmtool.h"
#include "../gmtool.h"
#include "../gmtool_structs.h"
-#include "../editing.h"
+#include <editing.h>
#include <kernel/region.h>
#include <kernel/terrain.h>
diff --git a/src/common/bindings/bind_hashtable.c b/src/common/bindings/bind_hashtable.c
index c82d874f9..be00fe0ad 100644
--- a/src/common/bindings/bind_hashtable.c
+++ b/src/common/bindings/bind_hashtable.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "bind_hashtable.h"
#include <kernel/building.h>
diff --git a/src/common/bindings/bind_message.c b/src/common/bindings/bind_message.c
index cc63ee5aa..93577ad99 100644
--- a/src/common/bindings/bind_message.c
+++ b/src/common/bindings/bind_message.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
// kernel includes
diff --git a/src/common/bindings/bind_region.c b/src/common/bindings/bind_region.c
index 0333b7608..97ac77d14 100644
--- a/src/common/bindings/bind_region.c
+++ b/src/common/bindings/bind_region.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "bind_region.h"
#include "bind_unit.h"
#include "bind_ship.h"
diff --git a/src/common/bindings/bind_ship.c b/src/common/bindings/bind_ship.c
index 862f026f2..17c03be82 100644
--- a/src/common/bindings/bind_ship.c
+++ b/src/common/bindings/bind_ship.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "bind_ship.h"
#include "bind_unit.h"
diff --git a/src/common/bindings/bind_sqlite.c b/src/common/bindings/bind_sqlite.c
index 11f3cf2b0..ce7f1aed4 100644
--- a/src/common/bindings/bind_sqlite.c
+++ b/src/common/bindings/bind_sqlite.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "bind_unit.h"
#include "bindings.h"
diff --git a/src/common/bindings/bind_storage.c b/src/common/bindings/bind_storage.c
index 9e341f073..23b9a0a5a 100644
--- a/src/common/bindings/bind_storage.c
+++ b/src/common/bindings/bind_storage.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/types.h>
#include "bind_storage.h"
diff --git a/src/common/bindings/bind_unit.c b/src/common/bindings/bind_unit.c
index 8adfbaa9c..37344a080 100644
--- a/src/common/bindings/bind_unit.c
+++ b/src/common/bindings/bind_unit.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "bind_unit.h"
#include "bind_attrib.h"
diff --git a/src/common/bindings/bindings.c b/src/common/bindings/bindings.c
index c780b48f0..9c43d821e 100644
--- a/src/common/bindings/bindings.c
+++ b/src/common/bindings/bindings.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "bindings.h"
#include "bind_unit.h"
#include "bind_faction.h"
@@ -52,6 +52,7 @@ without prior permission by the authors of Eressea.
#include <util/attrib.h>
#include <util/base36.h>
+#include <util/eventbus.h>
#include <util/language.h>
#include <util/lists.h>
#include <util/log.h>
@@ -1005,11 +1006,13 @@ static void args_free(void * udata)
}
static void event_cb(void * sender, const char * event, void * udata) {
+ lua_State * L = (lua_State *)global.vm_state;
event_args * args = (event_args *)udata;
int nargs = 2;
+
lua_rawgeti(L, LUA_REGISTRYINDEX, args->hfunction);
if (sender && args->sendertype) {
- tolua_pushusertype(L, sender, args->sendertype);
+ tolua_pushusertype(L, sender, TOLUA_CAST args->sendertype);
} else {
lua_pushnil(L);
}
@@ -1052,7 +1055,8 @@ tolua_eventbus_fire(lua_State * L)
{
void * sender = tolua_tousertype(L, 1, 0);
const char * event = tolua_tostring(L, 2, 0);
- eventbus_fire(sender, event, args);
+/* eventbus_fire(sender, event, args); */
+ return 0;
}
static void
diff --git a/src/common/bindings/helpers.c b/src/common/bindings/helpers.c
index 91c472ad2..37a85c2e1 100644
--- a/src/common/bindings/helpers.c
+++ b/src/common/bindings/helpers.c
@@ -11,7 +11,7 @@ without prior permission by the authors of Eressea.
*/
#include "helpers.h"
-#include <config.h>
+#include <platform.h>
#include <util/functions.h>
#include <util/log.h>
diff --git a/src/common/build/Jamfile b/src/common/build/Jamfile
index ad206f4c0..1263d230b 100644
--- a/src/common/build/Jamfile
+++ b/src/common/build/Jamfile
@@ -32,7 +32,7 @@ SERVER_SOURCES =
kernel.c
stdafx.c
util.c
- main.c
+ external.c
;
CCFLAGS += -DSQLITE_THREADSAFE=0 ;
diff --git a/src/common/build/curses.c b/src/common/build/curses.c
index e9c8622f4..588e24944 100644
--- a/src/common/build/curses.c
+++ b/src/common/build/curses.c
@@ -1,6 +1,7 @@
#include "common/settings.h"
-#include "common/config.h"
+#include <platform.h>
#include "stdafx.h"
-#include "eressea/curses/listbox.c"
-#include "eressea/gmtool.c"
+#include <util/listbox.c>
+#include <gmtool.c>
+#include <editing.c>
diff --git a/src/common/build/main.c b/src/common/build/external.c
similarity index 75%
rename from src/common/build/main.c
rename to src/common/build/external.c
index 7649ff68b..25fb2428d 100644
--- a/src/common/build/main.c
+++ b/src/common/build/external.c
@@ -1,8 +1,7 @@
#include "common/settings.h"
-#include "common/config.h"
+#include <platform.h>
#include "stdafx.h"
-#include <eressea/server.c>
#include <external/sqlite3.c>
#include <external/md5.c>
#include <external/bson/bson.c>
diff --git a/src/common/build/gamecode.c b/src/common/build/gamecode.c
index eb05d7396..d2f5ed94b 100644
--- a/src/common/build/gamecode.c
+++ b/src/common/build/gamecode.c
@@ -1,100 +1,97 @@
-#include "common/settings.h"
-#include "common/config.h"
+#include <settings.h>
+#include <platform.h>
#include "stdafx.h"
#ifdef BINDINGS_TOLUA
-#include "eressea/tolua/bindings.c"
-#include "eressea/tolua/bind_attrib.c"
-#include "eressea/tolua/bind_sqlite.c"
-#include "eressea/tolua/bind_unit.c"
-#include "eressea/tolua/bind_ship.c"
-#include "eressea/tolua/bind_building.c"
-#include "eressea/tolua/bind_region.c"
-#include "eressea/tolua/bind_faction.c"
-#include "eressea/tolua/bind_message.c"
-#include "eressea/tolua/bind_hashtable.c"
-#include "eressea/tolua/bind_gmtool.c"
-#include "eressea/tolua/bind_storage.c"
-#include "eressea/tolua/helpers.c"
+#include <bindings/bindings.c>
+#include <bindings/bind_attrib.c>
+#include <bindings/bind_sqlite.c>
+#include <bindings/bind_unit.c>
+#include <bindings/bind_ship.c>
+#include <bindings/bind_building.c>
+#include <bindings/bind_region.c>
+#include <bindings/bind_faction.c>
+#include <bindings/bind_message.c>
+#include <bindings/bind_hashtable.c>
+#include <bindings/bind_gmtool.c>
+#include <bindings/bind_storage.c>
+#include <bindings/helpers.c>
#endif
-#include "eressea/console.c"
-#include "eressea/editing.c"
+#include <gamecode/archetype.c>
+#include <gamecode/creation.c>
+#include <gamecode/creport.c>
+#include <gamecode/economy.c>
+#include <gamecode/give.c>
+#include <gamecode/items.c>
+#include <gamecode/laws.c>
+#include <gamecode/luck.c>
+#include <gamecode/market.c>
+#include <gamecode/monster.c>
+#include <gamecode/randenc.c>
+#include <gamecode/report.c>
+#include <gamecode/spells.c>
+#include <gamecode/spy.c>
+#include <gamecode/study.c>
+#include <gamecode/summary.c>
+#include <gamecode/xmlreport.c>
-#include "common/gamecode/archetype.c"
-#include "common/gamecode/creation.c"
-#include "common/gamecode/creport.c"
-#include "common/gamecode/economy.c"
-#include "common/gamecode/give.c"
-#include "common/gamecode/items.c"
-#include "common/gamecode/laws.c"
-#include "common/gamecode/luck.c"
-#include "common/gamecode/market.c"
-#include "common/gamecode/monster.c"
-#include "common/gamecode/randenc.c"
-#include "common/gamecode/report.c"
-#include "common/gamecode/spells.c"
-#include "common/gamecode/spy.c"
-#include "common/gamecode/study.c"
-#include "common/gamecode/summary.c"
-#include "common/gamecode/xmlreport.c"
+#include <races/dragons.c>
+#include <races/illusion.c>
+#include <races/races.c>
+#include <races/zombies.c>
-#include "common/races/dragons.c"
-#include "common/races/illusion.c"
-#include "common/races/races.c"
-#include "common/races/zombies.c"
+#include <attributes/alliance.c>
+#include <attributes/attributes.c>
+#include <attributes/fleechance.c>
+#include <attributes/follow.c>
+#include <attributes/giveitem.c>
+#include <attributes/gm.c>
+#include <attributes/hate.c>
+#include <attributes/iceberg.c>
+#include <attributes/key.c>
+#include <attributes/matmod.c>
+#include <attributes/movement.c>
+#include <attributes/moved.c>
+#include <attributes/object.c>
+#include <attributes/option.c>
+#include <attributes/orcification.c>
+#include <attributes/otherfaction.c>
+#include <attributes/overrideroads.c>
+#include <attributes/racename.c>
+#include <attributes/raceprefix.c>
+#include <attributes/reduceproduction.c>
+#include <attributes/targetregion.c>
+#include <attributes/viewrange.c>
+#include <attributes/variable.c>
-#include "common/attributes/alliance.c"
-#include "common/attributes/attributes.c"
-#include "common/attributes/fleechance.c"
-#include "common/attributes/follow.c"
-#include "common/attributes/giveitem.c"
-#include "common/attributes/gm.c"
-#include "common/attributes/hate.c"
-#include "common/attributes/iceberg.c"
-#include "common/attributes/key.c"
-#include "common/attributes/matmod.c"
-#include "common/attributes/movement.c"
-#include "common/attributes/moved.c"
-#include "common/attributes/object.c"
-#include "common/attributes/option.c"
-#include "common/attributes/orcification.c"
-#include "common/attributes/otherfaction.c"
-#include "common/attributes/overrideroads.c"
-#include "common/attributes/racename.c"
-#include "common/attributes/raceprefix.c"
-#include "common/attributes/reduceproduction.c"
-#include "common/attributes/targetregion.c"
-#include "common/attributes/viewrange.c"
-#include "common/attributes/variable.c"
+#include <items/artrewards.c>
+#include <items/demonseye.c>
+#include <items/itemtypes.c>
+#include <items/phoenixcompass.c>
+#include <items/seed.c>
+#include <items/weapons.c>
+#include <items/xerewards.c>
-#include "common/items/artrewards.c"
-#include "common/items/demonseye.c"
-#include "common/items/itemtypes.c"
-#include "common/items/phoenixcompass.c"
-#include "common/items/seed.c"
-#include "common/items/weapons.c"
-#include "common/items/xerewards.c"
+#include <spells/alp.c>
+#include <spells/buildingcurse.c>
+#include <spells/combatspells.c>
+#include <spells/regioncurse.c>
+#include <spells/shipcurse.c>
+#include <spells/spells.c>
+#include <spells/unitcurse.c>
-#include "common/spells/alp.c"
-#include "common/spells/buildingcurse.c"
-#include "common/spells/combatspells.c"
-#include "common/spells/regioncurse.c"
-#include "common/spells/shipcurse.c"
-#include "common/spells/spells.c"
-#include "common/spells/unitcurse.c"
-
-#include "common/triggers/changefaction.c"
-#include "common/triggers/changerace.c"
-#include "common/triggers/clonedied.c"
-#include "common/triggers/createcurse.c"
-#include "common/triggers/createunit.c"
-#include "common/triggers/gate.c"
-#include "common/triggers/giveitem.c"
-#include "common/triggers/killunit.c"
-#include "common/triggers/removecurse.c"
-#include "common/triggers/shock.c"
-#include "common/triggers/timeout.c"
-#include "common/triggers/triggers.c"
-#include "common/triggers/unguard.c"
-#include "common/triggers/unitmessage.c"
+#include <triggers/changefaction.c>
+#include <triggers/changerace.c>
+#include <triggers/clonedied.c>
+#include <triggers/createcurse.c>
+#include <triggers/createunit.c>
+#include <triggers/gate.c>
+#include <triggers/giveitem.c>
+#include <triggers/killunit.c>
+#include <triggers/removecurse.c>
+#include <triggers/shock.c>
+#include <triggers/timeout.c>
+#include <triggers/triggers.c>
+#include <triggers/unguard.c>
+#include <triggers/unitmessage.c>
diff --git a/src/common/build/kernel.c b/src/common/build/kernel.c
index 6921841e0..5da321951 100644
--- a/src/common/build/kernel.c
+++ b/src/common/build/kernel.c
@@ -1,55 +1,55 @@
-#include "common/settings.h"
-#include "common/config.h"
+#include <settings.h>
+#include <platform.h>
#include "stdafx.h"
-#include "common/kernel/alchemy.c"
-#include "common/kernel/alliance.c"
-#include "common/kernel/battle.c"
-#include "common/kernel/binarystore.c"
-#include "common/kernel/connection.c"
-#include "common/kernel/build.c"
-#include "common/kernel/building.c"
-#include "common/kernel/calendar.c"
-#include "common/kernel/command.c"
-#include "common/kernel/curse.c"
-#include "common/kernel/equipment.c"
-#include "common/kernel/eressea.c"
-#include "common/kernel/faction.c"
-#include "common/kernel/group.c"
-#include "common/kernel/item.c"
-#include "common/kernel/karma.c"
-#include "common/kernel/magic.c"
-#include "common/kernel/message.c"
-#include "common/kernel/move.c"
-#include "common/kernel/names.c"
-#include "common/kernel/order.c"
-#include "common/kernel/pathfinder.c"
-#include "common/kernel/plane.c"
-#include "common/kernel/player.c"
-#include "common/kernel/pool.c"
-#include "common/kernel/race.c"
-#include "common/kernel/region.c"
-#include "common/kernel/reports.c"
-#include "common/kernel/resources.c"
-#include "common/kernel/save.c"
-#include "common/kernel/ship.c"
-#include "common/kernel/skill.c"
-#include "common/kernel/spell.c"
-#include "common/kernel/teleport.c"
-#include "common/kernel/terrain.c"
-#include "common/kernel/textstore.c"
-#include "common/kernel/unit.c"
-#include "common/kernel/xmlreader.c"
-#include "common/kernel/sqlite.c"
+#include <kernel/alchemy.c>
+#include <kernel/alliance.c>
+#include <kernel/battle.c>
+#include <kernel/binarystore.c>
+#include <kernel/connection.c>
+#include <kernel/build.c>
+#include <kernel/building.c>
+#include <kernel/calendar.c>
+#include <kernel/command.c>
+#include <kernel/curse.c>
+#include <kernel/equipment.c>
+#include <kernel/eressea.c>
+#include <kernel/faction.c>
+#include <kernel/group.c>
+#include <kernel/item.c>
+#include <kernel/karma.c>
+#include <kernel/magic.c>
+#include <kernel/message.c>
+#include <kernel/move.c>
+#include <kernel/names.c>
+#include <kernel/order.c>
+#include <kernel/pathfinder.c>
+#include <kernel/plane.c>
+#include <kernel/player.c>
+#include <kernel/pool.c>
+#include <kernel/race.c>
+#include <kernel/region.c>
+#include <kernel/reports.c>
+#include <kernel/resources.c>
+#include <kernel/save.c>
+#include <kernel/ship.c>
+#include <kernel/skill.c>
+#include <kernel/spell.c>
+#include <kernel/teleport.c>
+#include <kernel/terrain.c>
+#include <kernel/textstore.c>
+#include <kernel/unit.c>
+#include <kernel/xmlreader.c>
+#include <kernel/sqlite.c>
-#include "common/modules/arena.c"
-#include "common/modules/autoseed.c"
-#include "common/modules/dungeon.c"
-#include "common/modules/gmcmd.c"
-#include "common/modules/infocmd.c"
-#include "common/modules/museum.c"
-#include "common/modules/score.c"
-#include "common/modules/weather.c"
-#include "common/modules/wormhole.c"
-#include "common/modules/xecmd.c"
-#include "common/modules/xmas.c"
+#include <modules/arena.c>
+#include <modules/autoseed.c>
+#include <modules/dungeon.c>
+#include <modules/gmcmd.c>
+#include <modules/infocmd.c>
+#include <modules/museum.c>
+#include <modules/score.c>
+#include <modules/weather.c>
+#include <modules/wormhole.c>
+#include <modules/xecmd.c>
+#include <modules/xmas.c>
diff --git a/src/common/build/stdafx.h b/src/common/build/stdafx.h
index 360bf55a4..27a78105e 100644
--- a/src/common/build/stdafx.h
+++ b/src/common/build/stdafx.h
@@ -1,2 +1,2 @@
#include "common/settings.h"
-#include "common/config.h"
+#include <platform.h>
diff --git a/src/common/build/util.c b/src/common/build/util.c
index 899f85524..ca2413114 100644
--- a/src/common/build/util.c
+++ b/src/common/build/util.c
@@ -1,38 +1,40 @@
-#include "common/settings.h"
-#include "common/config.h"
+#include <settings.h>
+#include <platform.h>
#include "stdafx.h"
-#include "common/iniparser/iniparser.c"
-#include "common/util/attrib.c"
-#include "common/util/argstack.c"
-#include "common/util/base36.c"
-#include "common/util/crmessage.c"
-#include "common/util/cvector.c"
-#include "common/util/dice.c"
-#include "common/util/event.c"
-#include "common/util/eventbus.c"
-#include "common/util/filereader.c"
-#include "common/util/functions.c"
-#include "common/util/goodies.c"
-#include "common/util/language.c"
-#include "common/util/lists.c"
-#include "common/util/log.c"
-#include "common/util/message.c"
-#include "common/util/mt19937ar.c"
-#include "common/util/nrmessage.c"
-#include "common/util/parser.c"
-#include "common/util/rand.c"
-#include "common/util/resolve.c"
-#include "common/util/sql.c"
-#include "common/util/translation.c"
-#include "common/util/umlaut.c"
-#include "common/util/unicode.c"
-#include "common/util/xml.c"
+#include <external/iniparser/iniparser.c>
+#include <external/mt19937ar.c>
+
+#include <util/console.c>
+#include <util/attrib.c>
+#include <util/argstack.c>
+#include <util/base36.c>
+#include <util/crmessage.c>
+#include <util/cvector.c>
+#include <util/dice.c>
+#include <util/event.c>
+#include <util/eventbus.c>
+#include <util/filereader.c>
+#include <util/functions.c>
+#include <util/goodies.c>
+#include <util/language.c>
+#include <util/lists.c>
+#include <util/log.c>
+#include <util/message.c>
+#include <util/nrmessage.c>
+#include <util/parser.c>
+#include <util/rand.c>
+#include <util/resolve.c>
+#include <util/sql.c>
+#include <util/translation.c>
+#include <util/umlaut.c>
+#include <util/unicode.c>
+#include <util/xml.c>
#ifndef HAVE_INLINE
-#include "common/util/bsdstring.c"
+#include <util/bsdstring.c>
#endif
#ifdef __GNUC__
-#include "common/util/strncpy.c"
+#include <util/strncpy.c>
#endif
diff --git a/src/common/editing.c b/src/common/editing.c
index 15dfe7107..0ffc33ab2 100644
--- a/src/common/editing.c
+++ b/src/common/editing.c
@@ -8,7 +8,7 @@
*
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "editing.h"
diff --git a/src/common/gamecode.vcproj b/src/common/gamecode.vcproj
index fcc9f7dc2..17e7570fb 100644
--- a/src/common/gamecode.vcproj
+++ b/src/common/gamecode.vcproj
@@ -84,73 +84,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
- <Configuration
- Name="Profile|Win32"
- OutputDirectory="Profile/gamecode"
- IntermediateDirectory="Profile/gamecode"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..;."
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- AdditionalIncludeDirectories="..;."
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/gamecode.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release/gamecode"
diff --git a/src/common/gamecode/archetype.c b/src/common/gamecode/archetype.c
index 6e21eeb1a..af369af9a 100644
--- a/src/common/gamecode/archetype.c
+++ b/src/common/gamecode/archetype.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "archetype.h"
diff --git a/src/common/gamecode/creation.c b/src/common/gamecode/creation.c
index 19388be40..9ca399b7d 100644
--- a/src/common/gamecode/creation.c
+++ b/src/common/gamecode/creation.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "creation.h"
#include "monster.h"
diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index dc4a748f5..7e133d568 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -7,7 +7,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "creport.h"
diff --git a/src/common/gamecode/economy.c b/src/common/gamecode/economy.c
index cd9bf8a12..4b6be56df 100644
--- a/src/common/gamecode/economy.c
+++ b/src/common/gamecode/economy.c
@@ -21,7 +21,7 @@
#pragma region includes
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "economy.h"
diff --git a/src/common/gamecode/give.c b/src/common/gamecode/give.c
index e82f5e455..87c47845b 100644
--- a/src/common/gamecode/give.c
+++ b/src/common/gamecode/give.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "give.h"
diff --git a/src/common/gamecode/items.c b/src/common/gamecode/items.c
index 8a5402d39..dd022765d 100644
--- a/src/common/gamecode/items.c
+++ b/src/common/gamecode/items.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "items.h"
diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index de4497c1d..c5b0602dd 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -21,7 +21,7 @@
#pragma region includes
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "laws.h"
diff --git a/src/common/gamecode/luck.c b/src/common/gamecode/luck.c
index 56c4b9046..eb2affab1 100644
--- a/src/common/gamecode/luck.c
+++ b/src/common/gamecode/luck.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "luck.h"
diff --git a/src/common/gamecode/market.c b/src/common/gamecode/market.c
index 49382e537..6668606f8 100644
--- a/src/common/gamecode/market.c
+++ b/src/common/gamecode/market.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "market.h"
diff --git a/src/common/gamecode/monster.c b/src/common/gamecode/monster.c
index ad8049945..b2d54f448 100644
--- a/src/common/gamecode/monster.c
+++ b/src/common/gamecode/monster.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "monster.h"
diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c
index e4d281c9e..a09344bd6 100644
--- a/src/common/gamecode/randenc.c
+++ b/src/common/gamecode/randenc.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "randenc.h"
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index f80975460..69150c927 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -14,7 +14,7 @@
#define ECHECK_VERSION "4.01"
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
/* modules includes */
diff --git a/src/common/gamecode/spells.c b/src/common/gamecode/spells.c
index ecb289361..3d283d65f 100644
--- a/src/common/gamecode/spells.c
+++ b/src/common/gamecode/spells.c
@@ -11,7 +11,7 @@
* because it's so much work to get them out of the big array.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "spy.h"
diff --git a/src/common/gamecode/spy.c b/src/common/gamecode/spy.c
index c488d0a6b..0891ebd12 100644
--- a/src/common/gamecode/spy.c
+++ b/src/common/gamecode/spy.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "spy.h"
diff --git a/src/common/gamecode/study.c b/src/common/gamecode/study.c
index d006a66e2..8213c5e04 100644
--- a/src/common/gamecode/study.c
+++ b/src/common/gamecode/study.c
@@ -22,7 +22,7 @@
#define TEACH_ALL 1
#define TEACH_FRIENDS
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "study.h"
diff --git a/src/common/gamecode/summary.c b/src/common/gamecode/summary.c
index 498a57f6a..1542a77f2 100644
--- a/src/common/gamecode/summary.c
+++ b/src/common/gamecode/summary.c
@@ -8,8 +8,8 @@
*
*/
-/* wenn config.h nicht vor curses included wird, kompiliert es unter windows nicht */
-#include <config.h>
+/* wenn platform.h nicht vor curses included wird, kompiliert es unter windows nicht */
+#include <platform.h>
#include <kernel/eressea.h>
#include "summary.h"
diff --git a/src/common/gamecode/xmlreport.c b/src/common/gamecode/xmlreport.c
index 5cef7feb0..a4333601e 100644
--- a/src/common/gamecode/xmlreport.c
+++ b/src/common/gamecode/xmlreport.c
@@ -7,7 +7,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "xmlreport.h"
diff --git a/src/common/gmtool.c b/src/common/gmtool.c
index 654972e15..7f4c9f523 100644
--- a/src/common/gmtool.c
+++ b/src/common/gmtool.c
@@ -8,16 +8,14 @@
*
*/
-/* wenn config.h nicht vor curses included wird, kompiliert es unter windows nicht */
-#include <config.h>
+/* wenn platform.h nicht vor curses included wird, kompiliert es unter windows nicht */
+#include <platform.h>
#include <curses.h>
#include <kernel/eressea.h>
#include "gmtool.h"
#include "gmtool_structs.h"
#include "editing.h"
-#include "console.h"
-#include "curses/listbox.h"
#include <modules/xmas.h>
#include <modules/gmcmd.h>
@@ -59,6 +57,8 @@
#include <util/log.h>
#include <util/rng.h>
#include <util/base36.h>
+#include <util/console.h>
+#include <util/listbox.h>
#include <util/storage.h>
#include <libxml/encoding.h>
diff --git a/src/common/items/artrewards.c b/src/common/items/artrewards.c
index e73f99933..37d32c490 100644
--- a/src/common/items/artrewards.c
+++ b/src/common/items/artrewards.c
@@ -11,7 +11,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "artrewards.h"
diff --git a/src/common/items/demonseye.c b/src/common/items/demonseye.c
index 76c00a9df..7cca80ba9 100644
--- a/src/common/items/demonseye.c
+++ b/src/common/items/demonseye.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "demonseye.h"
diff --git a/src/common/items/itemtypes.c b/src/common/items/itemtypes.c
index 2c197bcba..8239ccd5f 100644
--- a/src/common/items/itemtypes.c
+++ b/src/common/items/itemtypes.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "itemtypes.h"
diff --git a/src/common/items/phoenixcompass.c b/src/common/items/phoenixcompass.c
index d06ef91f5..5cdaf6a91 100644
--- a/src/common/items/phoenixcompass.c
+++ b/src/common/items/phoenixcompass.c
@@ -11,7 +11,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "phoenixcompass.h"
diff --git a/src/common/items/seed.c b/src/common/items/seed.c
index 2ad1f13b7..3ca40ca74 100644
--- a/src/common/items/seed.c
+++ b/src/common/items/seed.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "seed.h"
diff --git a/src/common/items/speedsail.c b/src/common/items/speedsail.c
index bd2ddd9ba..c62d0e2cf 100644
--- a/src/common/items/speedsail.c
+++ b/src/common/items/speedsail.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "speedsail.h"
diff --git a/src/common/items/weapons.c b/src/common/items/weapons.c
index 9effbda18..57ea38654 100644
--- a/src/common/items/weapons.c
+++ b/src/common/items/weapons.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "weapons.h"
diff --git a/src/common/items/xerewards.c b/src/common/items/xerewards.c
index 6daee1163..7719d7394 100644
--- a/src/common/items/xerewards.c
+++ b/src/common/items/xerewards.c
@@ -11,7 +11,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "xerewards.h"
diff --git a/src/common/kernel.vcproj b/src/common/kernel.vcproj
index 93e7d2ea8..46d28d9f5 100644
--- a/src/common/kernel.vcproj
+++ b/src/common/kernel.vcproj
@@ -84,73 +84,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
- <Configuration
- Name="Profile|Win32"
- OutputDirectory="Profile/kernel"
- IntermediateDirectory="Profile/kernel"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..;."
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- AdditionalIncludeDirectories="..;."
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/kernel.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release/kernel"
diff --git a/src/common/kernel/alchemy.c b/src/common/kernel/alchemy.c
index afecadc74..c7a164bd8 100644
--- a/src/common/kernel/alchemy.c
+++ b/src/common/kernel/alchemy.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "alchemy.h"
diff --git a/src/common/kernel/alliance.c b/src/common/kernel/alliance.c
index 53aedbb8d..de2694381 100644
--- a/src/common/kernel/alliance.c
+++ b/src/common/kernel/alliance.c
@@ -12,7 +12,7 @@ without prior permission by the authors of Eressea.
#pragma region includes
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "alliance.h"
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 9ecad26f3..2a5a877f7 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -14,7 +14,7 @@
#pragma region includes
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "battle.h"
diff --git a/src/common/kernel/binarystore.c b/src/common/kernel/binarystore.c
index cf6653421..4f9f0a2d7 100644
--- a/src/common/kernel/binarystore.c
+++ b/src/common/kernel/binarystore.c
@@ -6,7 +6,7 @@
This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "eressea.h"
#include "textstore.h"
diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c
index 23dd95eb1..f103e1e06 100644
--- a/src/common/kernel/build.c
+++ b/src/common/kernel/build.c
@@ -18,7 +18,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "build.h"
diff --git a/src/common/kernel/building.c b/src/common/kernel/building.c
index 7a98ca48e..f19b3ec06 100644
--- a/src/common/kernel/building.c
+++ b/src/common/kernel/building.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "building.h"
diff --git a/src/common/kernel/calendar.c b/src/common/kernel/calendar.c
index 3587c3131..8a4efccca 100644
--- a/src/common/kernel/calendar.c
+++ b/src/common/kernel/calendar.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include "calendar.h"
#include <assert.h>
diff --git a/src/common/kernel/command.c b/src/common/kernel/command.c
index c4ef84527..31d35e812 100644
--- a/src/common/kernel/command.c
+++ b/src/common/kernel/command.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "command.h"
diff --git a/src/common/kernel/connection.c b/src/common/kernel/connection.c
index 9b4b2c7f4..f1d7c2b1d 100644
--- a/src/common/kernel/connection.c
+++ b/src/common/kernel/connection.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "connection.h"
diff --git a/src/common/kernel/curse.c b/src/common/kernel/curse.c
index ecca96adf..718a48bbb 100644
--- a/src/common/kernel/curse.c
+++ b/src/common/kernel/curse.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "curse.h"
diff --git a/src/common/kernel/equipment.c b/src/common/kernel/equipment.c
index ca5edca83..c03b20ef2 100644
--- a/src/common/kernel/equipment.c
+++ b/src/common/kernel/equipment.c
@@ -17,7 +17,7 @@
* This program may not be sold or used commercially without prior written
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "equipment.h"
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index ab00c5fde..d53fa0c5b 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -18,7 +18,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
/* attributes includes */
diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index 6d362257f..c3cc02c39 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -25,7 +25,7 @@
extern "C" {
#endif
- /* this should always be the first thing included after config.h */
+ /* this should always be the first thing included after platform.h */
#include "types.h"
/* experimental gameplay features (that don't affect the savefile) */
diff --git a/src/common/kernel/faction.c b/src/common/kernel/faction.c
index a335f98ea..b9559ebe6 100644
--- a/src/common/kernel/faction.c
+++ b/src/common/kernel/faction.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "faction.h"
diff --git a/src/common/kernel/group.c b/src/common/kernel/group.c
index 15c6eddc7..16efd1b99 100644
--- a/src/common/kernel/group.c
+++ b/src/common/kernel/group.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "group.h"
diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c
index cc987510b..f6da5d8cd 100644
--- a/src/common/kernel/item.c
+++ b/src/common/kernel/item.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "item.h"
diff --git a/src/common/kernel/karma.c b/src/common/kernel/karma.c
index 9ef4cb5a4..f3c853bcb 100644
--- a/src/common/kernel/karma.c
+++ b/src/common/kernel/karma.c
@@ -12,7 +12,7 @@
*/
/* TODO: enum auf fst_ umstellen. Pointer auf Display-Routine */
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "karma.h"
diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c
index 109ece8aa..63cab24a1 100644
--- a/src/common/kernel/magic.c
+++ b/src/common/kernel/magic.c
@@ -18,7 +18,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "magic.h"
diff --git a/src/common/kernel/message.c b/src/common/kernel/message.c
index 4296581ab..65f796d69 100644
--- a/src/common/kernel/message.c
+++ b/src/common/kernel/message.c
@@ -18,7 +18,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "message.h"
diff --git a/src/common/kernel/move.c b/src/common/kernel/move.c
index 9f0f20d7c..d80f1b993 100644
--- a/src/common/kernel/move.c
+++ b/src/common/kernel/move.c
@@ -18,7 +18,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "move.h"
diff --git a/src/common/kernel/names.c b/src/common/kernel/names.c
index bd846db10..8e3315eab 100644
--- a/src/common/kernel/names.c
+++ b/src/common/kernel/names.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "names.h"
diff --git a/src/common/kernel/order.c b/src/common/kernel/order.c
index a3c72be7d..4397adb58 100644
--- a/src/common/kernel/order.c
+++ b/src/common/kernel/order.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "order.h"
diff --git a/src/common/kernel/pathfinder.c b/src/common/kernel/pathfinder.c
index c07076824..a46c9361a 100644
--- a/src/common/kernel/pathfinder.c
+++ b/src/common/kernel/pathfinder.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "pathfinder.h"
diff --git a/src/common/kernel/plane.c b/src/common/kernel/plane.c
index 8483a14dc..47c95bb6a 100644
--- a/src/common/kernel/plane.c
+++ b/src/common/kernel/plane.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "plane.h"
diff --git a/src/common/kernel/player.c b/src/common/kernel/player.c
index dcb1ecc49..c8076f640 100644
--- a/src/common/kernel/player.c
+++ b/src/common/kernel/player.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "player.h"
#include <util/goodies.h>
diff --git a/src/common/kernel/pool.c b/src/common/kernel/pool.c
index 562b950a3..af19509ca 100644
--- a/src/common/kernel/pool.c
+++ b/src/common/kernel/pool.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "pool.h"
diff --git a/src/common/kernel/race.c b/src/common/kernel/race.c
index a736e59b7..01403ec0b 100644
--- a/src/common/kernel/race.c
+++ b/src/common/kernel/race.c
@@ -17,7 +17,7 @@
* This program may not be sold or used commercially without prior written
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "race.h"
diff --git a/src/common/kernel/region.c b/src/common/kernel/region.c
index 3eff5d7c2..cef89c256 100644
--- a/src/common/kernel/region.c
+++ b/src/common/kernel/region.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "region.h"
diff --git a/src/common/kernel/reports.c b/src/common/kernel/reports.c
index e9eea362f..f3b6167d8 100644
--- a/src/common/kernel/reports.c
+++ b/src/common/kernel/reports.c
@@ -17,7 +17,7 @@
* This program may not be sold or used commercially without prior written
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "reports.h"
diff --git a/src/common/kernel/resources.c b/src/common/kernel/resources.c
index 3bf07b021..642f1a9e1 100644
--- a/src/common/kernel/resources.c
+++ b/src/common/kernel/resources.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "resources.h"
diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c
index d7feae64f..e0d560852 100644
--- a/src/common/kernel/save.c
+++ b/src/common/kernel/save.c
@@ -18,7 +18,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "save.h"
diff --git a/src/common/kernel/ship.c b/src/common/kernel/ship.c
index 69db9157e..ded216245 100644
--- a/src/common/kernel/ship.c
+++ b/src/common/kernel/ship.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "ship.h"
diff --git a/src/common/kernel/skill.c b/src/common/kernel/skill.c
index 0dc6c8571..7380d61a0 100644
--- a/src/common/kernel/skill.c
+++ b/src/common/kernel/skill.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "skill.h"
diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c
index a1df201ab..1c2f27254 100644
--- a/src/common/kernel/spell.c
+++ b/src/common/kernel/spell.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "spell.h"
diff --git a/src/common/kernel/sqlite.c b/src/common/kernel/sqlite.c
index 45385a407..3ac5e7a17 100644
--- a/src/common/kernel/sqlite.c
+++ b/src/common/kernel/sqlite.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include <kernel/faction.h>
#include <util/unicode.h>
diff --git a/src/common/kernel/teleport.c b/src/common/kernel/teleport.c
index 793707812..e4ac1f3b5 100644
--- a/src/common/kernel/teleport.c
+++ b/src/common/kernel/teleport.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "teleport.h"
diff --git a/src/common/kernel/terrain.c b/src/common/kernel/terrain.c
index b8ca731d8..3a453e9f6 100644
--- a/src/common/kernel/terrain.c
+++ b/src/common/kernel/terrain.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include <attributes/racename.h>
#include "terrain.h"
diff --git a/src/common/kernel/textstore.c b/src/common/kernel/textstore.c
index b49449127..a54174f81 100644
--- a/src/common/kernel/textstore.c
+++ b/src/common/kernel/textstore.c
@@ -6,7 +6,7 @@
This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "eressea.h"
#include "textstore.h"
diff --git a/src/common/kernel/types.h b/src/common/kernel/types.h
index 35dcf5c0e..d19d23897 100644
--- a/src/common/kernel/types.h
+++ b/src/common/kernel/types.h
@@ -27,7 +27,7 @@
* and write #include <settings-eressea.h> (or whatever settings you want
* your game to use) in there.
* !!! DO NOT COMMIT THE SETTINGS.H FILE TO CVS !!!
- * settings.h should always be the first thing you include (after config.h).
+ * settings.h should always be the first thing you include (after platform.h).
*/
#include <settings.h>
#include <util/variant.h>
diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c
index 33a4860e9..093037159 100644
--- a/src/common/kernel/unit.c
+++ b/src/common/kernel/unit.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "unit.h"
diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index 805971ceb..d5bf15b84 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -10,7 +10,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "xmlreader.h"
diff --git a/src/vc9/eressea-lua.vcproj b/src/common/lua-bindings.vcproj
similarity index 67%
rename from src/vc9/eressea-lua.vcproj
rename to src/common/lua-bindings.vcproj
index c92782eac..7f294d7a2 100644
--- a/src/vc9/eressea-lua.vcproj
+++ b/src/common/lua-bindings.vcproj
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
- Name="eressea-lua"
+ Version="8.00"
+ Name="lua-bindings"
ProjectGUID="{75501170-51C2-E641-BA8B-EDC008184192}"
- RootNamespace="eressea-lua"
+ RootNamespace="lua-bindings"
Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -40,8 +39,9 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories="..;../common"
+ AdditionalIncludeDirectories="..;../common;../external"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -50,6 +50,7 @@
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -73,8 +74,6 @@
ProgramDatabaseFile="$(OutDir)/eressea-lua.pdb"
SubSystem="1"
EntryPointSymbol="mainCRTStartup"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -95,6 +94,9 @@
<Tool
Name="VCAppVerifierTool"
/>
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -124,13 +126,14 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories="..;../common"
+ AdditionalIncludeDirectories="..;../common;../external"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
/>
<Tool
@@ -146,7 +149,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libxml2.lib pdcurses.lib lua5.1.lib luabind.lib"
+ AdditionalDependencies="../common/Release/util/util.lib ../common/Release/kernel/kernel.lib ../common/Release/gamecode/gamecode.lib lua/Release/bindings/bindings.lib Release/editor/editor.lib libxml2.lib pdcurses.lib lua5.1.lib luabind.lib"
OutputFile="$(OutDir)/eressea-lua.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=".."
@@ -155,8 +158,6 @@
OptimizeReferences="2"
EnableCOMDATFolding="2"
EntryPointSymbol="mainCRTStartup"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -177,6 +178,9 @@
<Tool
Name="VCAppVerifierTool"
/>
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -186,119 +190,117 @@
</References>
<Files>
<Filter
- Name="tolua"
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
>
<File
- RelativePath="..\eressea\tolua\bind_building.c"
+ RelativePath=".\bindings\bind_attrib.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_building.h"
+ RelativePath=".\bindings\bind_building.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_faction.c"
+ RelativePath=".\bindings\bind_faction.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_faction.h"
+ RelativePath=".\bindings\bind_gmtool.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_gmtool.c"
+ RelativePath=".\bindings\bind_hashtable.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_gmtool.h"
+ RelativePath=".\bindings\bind_message.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_hashtable.c"
+ RelativePath=".\bindings\bind_region.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_hashtable.h"
+ RelativePath=".\bindings\bind_ship.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_message.c"
+ RelativePath=".\bindings\bind_sqlite.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_message.h"
+ RelativePath=".\bindings\bind_storage.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_region.c"
+ RelativePath=".\bindings\bind_unit.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_region.h"
+ RelativePath=".\bindings\bindings.c"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_ship.c"
+ RelativePath=".\bindings\helpers.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ >
+ <File
+ RelativePath=".\bindings\bind_attrib.h"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_ship.h"
+ RelativePath=".\bindings\bind_building.h"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_unit.c"
+ RelativePath=".\bindings\bind_faction.h"
>
</File>
<File
- RelativePath="..\eressea\tolua\bind_unit.h"
+ RelativePath=".\bindings\bind_gmtool.h"
>
</File>
<File
- RelativePath="..\eressea\tolua\bindings.c"
+ RelativePath=".\bindings\bind_hashtable.h"
>
</File>
<File
- RelativePath="..\eressea\tolua\bindings.h"
+ RelativePath=".\bindings\bind_message.h"
>
</File>
<File
- RelativePath="..\eressea\tolua\helpers.c"
+ RelativePath=".\bindings\bind_region.h"
>
</File>
<File
- RelativePath="..\eressea\tolua\helpers.h"
+ RelativePath=".\bindings\bind_ship.h"
+ >
+ </File>
+ <File
+ RelativePath=".\bindings\bind_storage.h"
+ >
+ </File>
+ <File
+ RelativePath=".\bindings\bind_unit.h"
+ >
+ </File>
+ <File
+ RelativePath=".\bindings\bindings.h"
+ >
+ </File>
+ <File
+ RelativePath=".\bindings\helpers.h"
>
</File>
</Filter>
<File
- RelativePath="..\eressea\console.c"
- >
- </File>
- <File
- RelativePath="..\eressea\console.h"
- >
- </File>
- <File
- RelativePath="..\scripts\default.lua"
- >
- </File>
- <File
- RelativePath="..\scripts\eressea.lua"
- >
- </File>
- <File
- RelativePath="..\eressea\Jamfile"
- >
- </File>
- <File
- RelativePath="..\eressea\korrektur.c"
- >
- </File>
- <File
- RelativePath="..\scripts\run-tests.lua"
- >
- </File>
- <File
- RelativePath="..\eressea\server.cpp"
+ RelativePath=".\Jamfile"
>
</File>
</Files>
diff --git a/src/common/modules/arena.c b/src/common/modules/arena.c
index f07a60047..2b804cc97 100644
--- a/src/common/modules/arena.c
+++ b/src/common/modules/arena.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#if ARENA_MODULE
diff --git a/src/common/modules/autoseed.c b/src/common/modules/autoseed.c
index 57820234e..57293aaca 100644
--- a/src/common/modules/autoseed.c
+++ b/src/common/modules/autoseed.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "autoseed.h"
diff --git a/src/common/modules/dungeon.c b/src/common/modules/dungeon.c
index 17d10e983..8c2e29756 100644
--- a/src/common/modules/dungeon.c
+++ b/src/common/modules/dungeon.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#if DUNGEON_MODULE
diff --git a/src/common/modules/gmcmd.c b/src/common/modules/gmcmd.c
index be0854d99..b54380caf 100644
--- a/src/common/modules/gmcmd.c
+++ b/src/common/modules/gmcmd.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "gmcmd.h"
#include <kernel/command.h>
diff --git a/src/common/modules/infocmd.c b/src/common/modules/infocmd.c
index 4d5da45fa..a7fee4876 100644
--- a/src/common/modules/infocmd.c
+++ b/src/common/modules/infocmd.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#if INFOCMD_MODULE
diff --git a/src/common/modules/museum.c b/src/common/modules/museum.c
index f494fc5b0..c0dbe0f4e 100644
--- a/src/common/modules/museum.c
+++ b/src/common/modules/museum.c
@@ -18,7 +18,7 @@
* - Meldungen
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
diff --git a/src/common/modules/oceannames.c b/src/common/modules/oceannames.c
index 1b0c25e8f..98b65cce7 100644
--- a/src/common/modules/oceannames.c
+++ b/src/common/modules/oceannames.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "oceannames.h"
diff --git a/src/common/modules/score.c b/src/common/modules/score.c
index 1ae9c76b4..fcfe8e57f 100644
--- a/src/common/modules/score.c
+++ b/src/common/modules/score.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#if SCORE_MODULE
#include "score.h"
diff --git a/src/common/modules/weather.c b/src/common/modules/weather.c
index daf354912..3dccc622a 100644
--- a/src/common/modules/weather.c
+++ b/src/common/modules/weather.c
@@ -25,7 +25,7 @@
#ifdef WEATHER
-#include <config.h>
+#include <platform.h>
#include <eressea.h>
#include "weather.h"
diff --git a/src/common/modules/wormhole.c b/src/common/modules/wormhole.c
index 779f91bb9..7c9febeb0 100644
--- a/src/common/modules/wormhole.c
+++ b/src/common/modules/wormhole.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "settings.h"
diff --git a/src/common/modules/xecmd.c b/src/common/modules/xecmd.c
index d70123992..908b26654 100644
--- a/src/common/modules/xecmd.c
+++ b/src/common/modules/xecmd.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#if XECMD_MODULE
diff --git a/src/common/modules/xmas.c b/src/common/modules/xmas.c
index 024b45a0d..d5f3d9589 100644
--- a/src/common/modules/xmas.c
+++ b/src/common/modules/xmas.c
@@ -10,7 +10,7 @@
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "xmas.h"
diff --git a/src/common/races/dragons.c b/src/common/races/dragons.c
index 23d8874a0..e19a4e1e5 100644
--- a/src/common/races/dragons.c
+++ b/src/common/races/dragons.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "dragons.h"
diff --git a/src/common/races/illusion.c b/src/common/races/illusion.c
index 12920da45..2621441ba 100644
--- a/src/common/races/illusion.c
+++ b/src/common/races/illusion.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "illusion.h"
diff --git a/src/common/races/races.c b/src/common/races/races.c
index e1869abdf..b0a8cb72f 100644
--- a/src/common/races/races.c
+++ b/src/common/races/races.c
@@ -8,7 +8,7 @@
*
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "races.h"
diff --git a/src/common/races/zombies.c b/src/common/races/zombies.c
index 258bca5b2..4a32d6204 100644
--- a/src/common/races/zombies.c
+++ b/src/common/races/zombies.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "zombies.h"
diff --git a/src/vc9/editor.vcproj b/src/common/server.vcproj
similarity index 71%
rename from src/vc9/editor.vcproj
rename to src/common/server.vcproj
index 418f7cf18..3ba94ac39 100644
--- a/src/vc9/editor.vcproj
+++ b/src/common/server.vcproj
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
- Name="editor"
+ Version="8.00"
+ Name="server"
ProjectGUID="{D893D6B3-805D-9848-8EA4-CDA1B79151F6}"
- RootNamespace="editor"
+ RootNamespace="server"
Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -18,8 +17,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug/editor"
- IntermediateDirectory="Debug/editor"
+ OutputDirectory="Debug/server"
+ IntermediateDirectory="Debug/server"
ConfigurationType="4"
CharacterSet="2"
>
@@ -40,6 +39,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..;../common"
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
@@ -50,6 +50,7 @@
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -65,7 +66,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/editor.lib"
+ OutputFile="$(OutDir)/server.lib"
/>
<Tool
Name="VCALinkTool"
@@ -85,8 +86,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release/editor"
- IntermediateDirectory="Release/editor"
+ OutputDirectory="Release/server"
+ IntermediateDirectory="Release/server"
ConfigurationType="4"
CharacterSet="2"
>
@@ -115,6 +116,7 @@
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
/>
<Tool
@@ -130,7 +132,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/editor.lib"
+ OutputFile="$(OutDir)/server.lib"
/>
<Tool
Name="VCALinkTool"
@@ -153,41 +155,63 @@
</References>
<Files>
<Filter
- Name="curses"
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
>
<File
- RelativePath="..\eressea\curses\listbox.c"
+ RelativePath=".\config.h"
>
</File>
<File
- RelativePath="..\eressea\curses\listbox.h"
+ RelativePath=".\util\console.h"
+ >
+ </File>
+ <File
+ RelativePath=".\editing.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gmtool.h"
+ >
+ </File>
+ <File
+ RelativePath=".\gmtool_structs.h"
+ >
+ </File>
+ <File
+ RelativePath=".\util\listbox.h"
+ >
+ </File>
+ <File
+ RelativePath=".\lua.hpp"
+ >
+ </File>
+ <File
+ RelativePath=".\settings.h"
>
</File>
</Filter>
<Filter
- Name="lua"
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
>
<File
- RelativePath="..\eressea\lua\gm.cpp"
+ RelativePath=".\util\console.c"
+ >
+ </File>
+ <File
+ RelativePath=".\editing.c"
+ >
+ </File>
+ <File
+ RelativePath=".\gmtool.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\listbox.c"
>
</File>
</Filter>
- <File
- RelativePath="..\eressea\editing.c"
- >
- </File>
- <File
- RelativePath="..\eressea\editing.h"
- >
- </File>
- <File
- RelativePath="..\eressea\gmtool.c"
- >
- </File>
- <File
- RelativePath="..\eressea\gmtool.h"
- >
- </File>
</Files>
<Globals>
</Globals>
diff --git a/src/common/settings-conquest.h b/src/common/settings-conquest.h
deleted file mode 100644
index 9c7b16adc..000000000
--- a/src/common/settings-conquest.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* vi: set ts=2:
- +-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de>
- | | Enno Rehling <enno@eressea-pbem.de>
- | Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de>
- | (c) 1998 - 2002 | Henning Peters <faroul@beyond.kn-bremen.de>
- | | Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
- +-------------------+ Stefan Reich <reich@halbling.de>
-
- This program may not be used, modified or distributed
- without prior permission by the authors of Eressea.
-*/
-
-/*
- * Contains defines for the "conquest" vinyambar game (Speedgame).
- * Include this file from settings.h to make eressea work.
- */
-#define CATAPULT_AMMUNITION 1 /* Gebaut werden kann sie auch mit 0! */
-#define CHANGED_CROSSBOWS 1
-#define COMBAT_TURNS 5
-#define ENTERTAINBASE 15
-#define ENTERTAINPERLEVEL 5
-#define ENTERTAINFRACTION 20
-#define GAME_ID 3
-#define GROWING_TREES 1
-#define GUARD_DISABLES_PRODUCTION 1
-#define GUARD_DISABLES_RECRUIT 1
-#define HUNGER_DISABLES_LONGORDERS 1
-#define IMMUN_GEGEN_ANGRIFF 8
-#define LARGE_CASTLES 1
-#define NEW_MIGRATION 1
-#define NMRTIMEOUT 5
-#define PEASANTS_DO_NOT_STARVE 0
-#define PEASANT_ADJUSTMENT 1
-#define RACE_ADJUSTMENTS 1
-#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
-#define REDUCED_PEASANTGROWTH 1
-#define REMOVENMRNEWBIE 0
-#define RESOURCE_CONVERSION 1
-#define RESOURCE_QUANTITY 0.5
-#define TEACHDIFFERENCE 2
-#define GIVERESTRICTION 0
-#define NEWATSROI 0
-#if NEWATSROI == 1
-#define ATSBONUS 2
-#define ROIBONUS 4
-#endif
-
-#define ENHANCED_QUIT
-#define ALLIANCES
-#undef ALLIANCEJOIN
-#define AUTOALLIANCE (HELP_FIGHT)
-
-#define MAILITPATH "/usr/sbin:$HOME/bin:/bin:/usr/bin:/usr/local/bin"
diff --git a/src/common/settings-tutorial.h b/src/common/settings-tutorial.h
deleted file mode 100644
index bf62c9907..000000000
--- a/src/common/settings-tutorial.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* vi: set ts=2:
- +-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de>
- | | Enno Rehling <enno@eressea-pbem.de>
- | Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de>
- | (c) 1998 - 2003 | Henning Peters <faroul@beyond.kn-bremen.de>
- | | Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
- +-------------------+ Stefan Reich <reich@halbling.de>
-
- This program may not be used, modified or distributed
- without prior permission by the authors of Eressea.
-*/
-
-/*
- * Contains defines for the "free" game (Eressea) .
- * Include this file from settings.h to make eressea work.
- */
-#define ENTERTAINFRACTION 20
-#define TEACHDIFFERENCE 2
-#define GUARD_DISABLES_RECRUIT 1
-#define GUARD_DISABLES_PRODUCTION 1
-#define RESOURCE_QUANTITY 0.5
-#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
-#define COMBAT_TURNS 5
-#define NEWATSROI 0
-
-/* Vermehrungsrate Bauern in 1/10000.
-* Evt. Berechnungsfehler, reale Vermehrungsraten scheinen h�her. */
-#define PEASANTGROWTH 10
-#define BATTLE_KILLS_PEASANTS 20
-#define PEASANTLUCK 10
-
-#define HUNGER_REDUCES_SKILL /* Hunger reduziert den Talentwert
- auf die H�lfte */
-
-#define ASTRAL_ITEM_RESTRICTIONS /* keine grossen dinge im astralraum */
-#define NEW_DAEMONHUNGER_RULE
-#define NEW_COMBATSKILLS_RULE
-#define ROW_FACTOR 3 /* factor for combat row advancement rule */
-#define HEROES
-
-/* optional game components. TODO: These should either be
- * configuration variables (XML), script extensions (lua),
- * or both. We don't want separate binaries for different games
- */
-#define SCORE_MODULE 1
-#define MUSEUM_MODULE 0
-#define ARENA_MODULE 0
-#define WORMHOLE_MODULE 0
-#define XECMD_MODULE 0
-#define KARMA_MODULE 0
-#define DUNGEON_MODULE 0
-#define INFOCMD_MODULE 0
-#define CHANGED_CROSSBOWS 0 /* use the WTF_ARMORPIERCING flag */
-#define GLOBAL_WARMING 0 /* number of turns before global warming sets in */
-
-#define SIMPLE_COMBAT
-#define SIMPLE_ESCAPE
diff --git a/src/common/settings-vinyambar-3.h b/src/common/settings-vinyambar-3.h
deleted file mode 100644
index d940b32fb..000000000
--- a/src/common/settings-vinyambar-3.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* vi: set ts=2:
- +-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de>
- | | Enno Rehling <enno@eressea-pbem.de>
- | Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de>
- | (c) 1998 - 2003 | Henning Peters <faroul@beyond.kn-bremen.de>
- | | Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
- +-------------------+ Stefan Reich <reich@halbling.de>
-
- This program may not be used, modified or distributed
- without prior permission by the authors of Eressea.
-*/
-
-/*
- * Contains defines for the "alliance" vinyambar game (V3).
- * Include this file from settings.h to make eressea work.
- */
-#define ENTERTAINFRACTION 20
-#define TEACHDIFFERENCE 2
-#define GUARD_DISABLES_RECRUIT 1
-#define GUARD_DISABLES_PRODUCTION 1
-#define RESOURCE_QUANTITY 0.5
-#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
-#define NEWATSROI 0
-#define COMBAT_TURNS 5
-
-/* Vermehrungsrate Bauern in 1/10000.
-* Evt. Berechnungsfehler, reale Vermehrungsraten scheinen h�her. */
-#define PEASANTGROWTH 10
-#define BATTLE_KILLS_PEASANTS 20
-#define PEASANTLUCK 10
-
-#if NEWATSROI == 1
-#define ATSBONUS 2
-#define ROIBONUS 4
-#endif
diff --git a/src/common/settings-vinyambar-murder.h b/src/common/settings-vinyambar-murder.h
deleted file mode 100644
index 079d1f0e2..000000000
--- a/src/common/settings-vinyambar-murder.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* vi: set ts=2:
- +-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de>
- | | Enno Rehling <enno@eressea-pbem.de>
- | Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de>
- | (c) 1998 - 2001 | Henning Peters <faroul@beyond.kn-bremen.de>
- | | Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
- +-------------------+ Stefan Reich <reich@halbling.de>
-
- This program may not be used, modified or distributed
- without prior permission by the authors of Eressea.
-*/
-
-/*
- * Contains defines for the "murder variant" game (vinyambar) .
- * Include this file from settings.h to make eressea work.
- */
-#define GAME_ID 0
-#define IMMUN_GEGEN_ANGRIFF 8
-#define RESOURCE_CONVERSION 1
-#define LARGE_CASTLES 1
-#define GROWING_TREES 1
-#define REMOVENMRNEWBIE 1
-#define NMRTIMEOUT 4
-#define HUNGER_DISABLES_LONGORDERS 1
-#define REDUCED_PEASANTGROWTH 1
-#define RACE_ADJUSTMENTS 1
-#define TEACHDIFFERENCE 2
-#define PEASANT_ADJUSTMENT 1
-#define NEW_MIGRATION 1
-#define PEASANTS_DO_NOT_STARVE 0
-#define GUARD_DISABLES_RECRUIT 1
-#define GUARD_DISABLES_PRODUCTION 1
-#define RESOURCE_QUANTITY 1.0
-#define RECRUITFRACTION 40
-#define CATAPULT_AMMUNITION 1
-#define CHANGED_CROSSBOWS 1
-#define NEWATSROI 0
-
-#define VICTORY_CONDITION VICTORY_MURDER
-#define VICTORY_DELAY 4
-
-#define MAILITPATH "/usr/sbin:$HOME/bin:/bin:/usr/bin:/usr/local/bin"
diff --git a/src/common/settings-wdw.h b/src/common/settings-wdw.h
deleted file mode 100644
index faed41e90..000000000
--- a/src/common/settings-wdw.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* vi: set ts=2:
- +-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de>
- | | Enno Rehling <enno@eressea-pbem.de>
- | Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de>
- | (c) 1998 - 2003 | Henning Peters <faroul@beyond.kn-bremen.de>
- | | Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
- +-------------------+ Stefan Reich <reich@halbling.de>
-
- This program may not be used, modified or distributed
- without prior permission by the authors of Eressea.
-*/
-
-/*
- * Contains defines for the "alliance" vinyambar game (wdw).
- * Include this file from settings.h to make eressea work.
- */
-#define ENTERTAINFRACTION 20
-#define TEACHDIFFERENCE 2
-#define GUARD_DISABLES_RECRUIT 1
-#define GUARD_DISABLES_PRODUCTION 1
-#define RESOURCE_QUANTITY 0.5
-#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
-#define COMBAT_TURNS 5
-
-/* Vermehrungsrate Bauern in 1/10000.
-* Evt. Berechnungsfehler, reale Vermehrungsraten scheinen h�her. */
-#define PEASANTGROWTH 10
-#define BATTLE_KILLS_PEASANTS 20
-#define PEASANTLUCK 10
-
-#define HUNGER_REDUCES_SKILL /* Hunger reduziert den Talentwert
- auf die H�lfte */
-
-#define PEASANT_HUNGRY_DAEMONS_HAVE_FULL_SKILLS
-
-
-#define NEWATSROI 1
-#if NEWATSROI == 1
-#define ATSBONUS 2
-#define ROIBONUS 4
-#endif
-
-#undef ALLIANCEJOIN
-
-#define SCORE_MODULE
-#undef DUNGEON_MODULE
-#undef MUSEUM_MODULE
-#undef ARENA_MODULE
-#undef WORMHOLE_MODULE
-#undef XECMD_MODULE
-#define WDW_PYRAMID
diff --git a/src/common/settings-eressea.h b/src/common/settings.h
similarity index 100%
rename from src/common/settings-eressea.h
rename to src/common/settings.h
diff --git a/src/common/spells/alp.c b/src/common/spells/alp.c
index efb8ec86f..b6a618987 100644
--- a/src/common/spells/alp.c
+++ b/src/common/spells/alp.c
@@ -11,7 +11,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "alp.h"
diff --git a/src/common/spells/buildingcurse.c b/src/common/spells/buildingcurse.c
index 776bed013..802f68136 100644
--- a/src/common/spells/buildingcurse.c
+++ b/src/common/spells/buildingcurse.c
@@ -11,7 +11,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "buildingcurse.h"
diff --git a/src/common/spells/combatspells.c b/src/common/spells/combatspells.c
index 0d2b8d48e..0a77e3045 100644
--- a/src/common/spells/combatspells.c
+++ b/src/common/spells/combatspells.c
@@ -9,7 +9,7 @@
This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "combatspells.h"
diff --git a/src/common/spells/regioncurse.c b/src/common/spells/regioncurse.c
index 6912e7d8d..b05d70e90 100644
--- a/src/common/spells/regioncurse.c
+++ b/src/common/spells/regioncurse.c
@@ -11,7 +11,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "regioncurse.h"
diff --git a/src/common/spells/shipcurse.c b/src/common/spells/shipcurse.c
index 0f033b522..2be53e4da 100644
--- a/src/common/spells/shipcurse.c
+++ b/src/common/spells/shipcurse.c
@@ -11,7 +11,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "shipcurse.h"
diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index b6514b8db..3475ad301 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "spells.h"
diff --git a/src/common/spells/unitcurse.c b/src/common/spells/unitcurse.c
index fdeb61c6b..2d6e4d085 100644
--- a/src/common/spells/unitcurse.c
+++ b/src/common/spells/unitcurse.c
@@ -11,7 +11,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "unitcurse.h"
diff --git a/src/common/triggers/changefaction.c b/src/common/triggers/changefaction.c
index 691305309..249e4683b 100644
--- a/src/common/triggers/changefaction.c
+++ b/src/common/triggers/changefaction.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "changefaction.h"
diff --git a/src/common/triggers/changerace.c b/src/common/triggers/changerace.c
index fa563b4a4..f6ca84622 100644
--- a/src/common/triggers/changerace.c
+++ b/src/common/triggers/changerace.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "changerace.h"
diff --git a/src/common/triggers/clonedied.c b/src/common/triggers/clonedied.c
index 6ad77689b..806399831 100644
--- a/src/common/triggers/clonedied.c
+++ b/src/common/triggers/clonedied.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "clonedied.h"
diff --git a/src/common/triggers/createcurse.c b/src/common/triggers/createcurse.c
index 9f0648428..0ff1d27c8 100644
--- a/src/common/triggers/createcurse.c
+++ b/src/common/triggers/createcurse.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "createcurse.h"
diff --git a/src/common/triggers/createunit.c b/src/common/triggers/createunit.c
index aa6cbd40d..a0cc7dc8f 100644
--- a/src/common/triggers/createunit.c
+++ b/src/common/triggers/createunit.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "createunit.h"
diff --git a/src/common/triggers/gate.c b/src/common/triggers/gate.c
index a84d91450..3ca29c6ca 100644
--- a/src/common/triggers/gate.c
+++ b/src/common/triggers/gate.c
@@ -9,7 +9,7 @@
This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "gate.h"
diff --git a/src/common/triggers/giveitem.c b/src/common/triggers/giveitem.c
index 3a441b02f..92d835d4e 100644
--- a/src/common/triggers/giveitem.c
+++ b/src/common/triggers/giveitem.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "giveitem.h"
diff --git a/src/common/triggers/killunit.c b/src/common/triggers/killunit.c
index 02cad7e9d..adc19c7bb 100644
--- a/src/common/triggers/killunit.c
+++ b/src/common/triggers/killunit.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "killunit.h"
diff --git a/src/common/triggers/removecurse.c b/src/common/triggers/removecurse.c
index 2be5986da..152be6ff4 100644
--- a/src/common/triggers/removecurse.c
+++ b/src/common/triggers/removecurse.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "removecurse.h"
diff --git a/src/common/triggers/shock.c b/src/common/triggers/shock.c
index 74dfbea94..fb349c5f7 100644
--- a/src/common/triggers/shock.c
+++ b/src/common/triggers/shock.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "shock.h"
diff --git a/src/common/triggers/timeout.c b/src/common/triggers/timeout.c
index 8b569dfa7..8e421575b 100644
--- a/src/common/triggers/timeout.c
+++ b/src/common/triggers/timeout.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "timeout.h"
diff --git a/src/common/triggers/triggers.c b/src/common/triggers/triggers.c
index 404bb83ca..9154e1912 100644
--- a/src/common/triggers/triggers.c
+++ b/src/common/triggers/triggers.c
@@ -17,7 +17,7 @@
* world.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
/* triggers includes */
diff --git a/src/common/triggers/unguard.c b/src/common/triggers/unguard.c
index 9947af80f..dbda41cce 100644
--- a/src/common/triggers/unguard.c
+++ b/src/common/triggers/unguard.c
@@ -9,7 +9,7 @@
This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "unguard.h"
diff --git a/src/common/triggers/unitmessage.c b/src/common/triggers/unitmessage.c
index 3e8fd397b..9974f381d 100644
--- a/src/common/triggers/unitmessage.c
+++ b/src/common/triggers/unitmessage.c
@@ -7,7 +7,7 @@ This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include <kernel/eressea.h>
#include "unitmessage.h"
diff --git a/src/common/util.vcproj b/src/common/util.vcproj
index acc3d2d8b..28a92ce00 100644
--- a/src/common/util.vcproj
+++ b/src/common/util.vcproj
@@ -84,73 +84,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
- <Configuration
- Name="Profile|Win32"
- OutputDirectory="Profile/util"
- IntermediateDirectory="Profile/util"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..;."
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- AdditionalIncludeDirectories="..;."
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/util.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release/util"
@@ -222,104 +155,53 @@
</References>
<Files>
<Filter
- Name="util"
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
>
- <File
- RelativePath=".\util\argstack.c"
- >
- </File>
<File
RelativePath=".\util\argstack.h"
>
</File>
- <File
- RelativePath=".\util\attrib.c"
- >
- </File>
<File
RelativePath=".\util\attrib.h"
>
</File>
- <File
- RelativePath=".\util\base36.c"
- >
- </File>
<File
RelativePath=".\util\base36.h"
>
</File>
- <File
- RelativePath=".\util\bsdstring.c"
- >
- </File>
<File
RelativePath=".\util\bsdstring.h"
>
</File>
- <File
- RelativePath=".\util\crmessage.c"
- >
- </File>
<File
RelativePath=".\util\crmessage.h"
>
</File>
- <File
- RelativePath=".\util\cvector.c"
- >
- </File>
<File
RelativePath=".\util\cvector.h"
>
</File>
- <File
- RelativePath=".\util\dice.c"
- >
- </File>
- <File
- RelativePath=".\util\event.c"
- >
- </File>
<File
RelativePath=".\util\event.h"
>
</File>
- <File
- RelativePath=".\util\eventbus.c"
- >
- </File>
<File
RelativePath=".\util\eventbus.h"
>
</File>
- <File
- RelativePath=".\util\filereader.c"
- >
- </File>
<File
RelativePath=".\util\filereader.h"
>
</File>
- <File
- RelativePath=".\util\functions.c"
- >
- </File>
<File
RelativePath=".\util\functions.h"
>
</File>
- <File
- RelativePath=".\util\goodies.c"
- >
- </File>
<File
RelativePath=".\util\goodies.h"
>
</File>
- <File
- RelativePath=".\util\language.c"
- >
- </File>
<File
RelativePath=".\util\language.h"
>
@@ -328,38 +210,18 @@
RelativePath=".\util\language_struct.h"
>
</File>
- <File
- RelativePath=".\util\lists.c"
- >
- </File>
<File
RelativePath=".\util\lists.h"
>
</File>
- <File
- RelativePath=".\util\log.c"
- >
- </File>
<File
RelativePath=".\util\log.h"
>
</File>
- <File
- RelativePath=".\util\message.c"
- >
- </File>
<File
RelativePath=".\util\message.h"
>
</File>
- <File
- RelativePath=".\util\mt19937ar.c"
- >
- </File>
- <File
- RelativePath=".\util\nrmessage.c"
- >
- </File>
<File
RelativePath=".\util\nrmessage.h"
>
@@ -368,34 +230,18 @@
RelativePath=".\util\nrmessage_struct.h"
>
</File>
- <File
- RelativePath=".\util\parser.c"
- >
- </File>
<File
RelativePath=".\util\parser.h"
>
</File>
- <File
- RelativePath=".\util\patricia.c"
- >
- </File>
<File
RelativePath=".\util\patricia.h"
>
</File>
- <File
- RelativePath=".\util\rand.c"
- >
- </File>
<File
RelativePath=".\util\rand.h"
>
</File>
- <File
- RelativePath=".\util\resolve.c"
- >
- </File>
<File
RelativePath=".\util\resolve.h"
>
@@ -404,10 +250,6 @@
RelativePath=".\util\rng.h"
>
</File>
- <File
- RelativePath=".\util\sql.c"
- >
- </File>
<File
RelativePath=".\util\sql.h"
>
@@ -416,30 +258,14 @@
RelativePath=".\util\storage.h"
>
</File>
- <File
- RelativePath=".\util\strings.c"
- >
- </File>
- <File
- RelativePath=".\util\translation.c"
- >
- </File>
<File
RelativePath=".\util\translation.h"
>
</File>
- <File
- RelativePath=".\util\umlaut.c"
- >
- </File>
<File
RelativePath=".\util\umlaut.h"
>
</File>
- <File
- RelativePath=".\util\unicode.c"
- >
- </File>
<File
RelativePath=".\util\unicode.h"
>
@@ -448,39 +274,124 @@
RelativePath=".\util\variant.h"
>
</File>
- <File
- RelativePath=".\util\xml.c"
- >
- </File>
<File
RelativePath=".\util\xml.h"
>
</File>
</Filter>
<Filter
- Name="iniparser"
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
>
<File
- RelativePath=".\iniparser\iniparser.c"
+ RelativePath=".\util\argstack.c"
>
</File>
<File
- RelativePath=".\iniparser\iniparser.h"
+ RelativePath=".\util\attrib.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\base36.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\bsdstring.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\crmessage.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\cvector.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\dice.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\event.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\eventbus.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\filereader.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\functions.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\goodies.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\language.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\lists.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\log.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\message.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\nrmessage.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\parser.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\patricia.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\rand.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\resolve.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\sql.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\strings.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\translation.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\umlaut.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\unicode.c"
+ >
+ </File>
+ <File
+ RelativePath=".\util\xml.c"
>
</File>
</Filter>
- <File
- RelativePath=".\config.h"
- >
- </File>
- <File
- RelativePath=".\util\dl\malloc.h"
- >
- </File>
- <File
- RelativePath=".\settings.h"
- >
- </File>
</Files>
<Globals>
</Globals>
diff --git a/src/common/util/attrib.c b/src/common/util/attrib.c
index e6f8e2353..62033911d 100644
--- a/src/common/util/attrib.c
+++ b/src/common/util/attrib.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "attrib.h"
#include "log.h"
diff --git a/src/common/util/base36.c b/src/common/util/base36.c
index 3b3f7a2b8..548066853 100644
--- a/src/common/util/base36.c
+++ b/src/common/util/base36.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include "base36.h"
#include <stdlib.h>
diff --git a/src/common/util/bsdstring.c b/src/common/util/bsdstring.c
index 331155a54..84802c70e 100644
--- a/src/common/util/bsdstring.c
+++ b/src/common/util/bsdstring.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include <string.h>
#include <errno.h>
#include <assert.h>
diff --git a/src/common/util/console.c b/src/common/util/console.c
index 33c461730..62353604a 100644
--- a/src/common/util/console.c
+++ b/src/common/util/console.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include "console.h"
/* lua includes */
diff --git a/src/common/util/crmessage.c b/src/common/util/crmessage.c
index 20ffe3a63..6cb1ba349 100644
--- a/src/common/util/crmessage.c
+++ b/src/common/util/crmessage.c
@@ -11,7 +11,7 @@
*/
-#include <config.h>
+#include <platform.h>
#include "crmessage.h"
#include "message.h"
diff --git a/src/common/util/cvector.c b/src/common/util/cvector.c
index eb39a4f90..b8483e1fb 100644
--- a/src/common/util/cvector.c
+++ b/src/common/util/cvector.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include "cvector.h"
#include "rng.h"
diff --git a/src/common/util/dice.c b/src/common/util/dice.c
index 36525074b..bf8593d0c 100644
--- a/src/common/util/dice.c
+++ b/src/common/util/dice.c
@@ -17,7 +17,7 @@
* authors.
*/
-#include <config.h>
+#include <platform.h>
#include "rng.h"
#include <assert.h>
diff --git a/src/common/util/event.c b/src/common/util/event.c
index ce73524b9..f7465262f 100644
--- a/src/common/util/event.c
+++ b/src/common/util/event.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "event.h"
/* util includes */
diff --git a/src/common/util/eventbus.c b/src/common/util/eventbus.c
index 71087ec9b..77e81b578 100644
--- a/src/common/util/eventbus.c
+++ b/src/common/util/eventbus.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include "eventbus.h"
/*
diff --git a/src/common/util/filereader.c b/src/common/util/filereader.c
index 49032e336..26c745851 100644
--- a/src/common/util/filereader.c
+++ b/src/common/util/filereader.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include "filereader.h"
#include <util/log.h>
diff --git a/src/common/util/functions.c b/src/common/util/functions.c
index b68e2c28a..207f3dfdd 100644
--- a/src/common/util/functions.c
+++ b/src/common/util/functions.c
@@ -12,7 +12,7 @@
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "functions.h"
/* libc includes */
diff --git a/src/common/util/goodies.c b/src/common/util/goodies.c
index 82308cf2f..90f2e6359 100644
--- a/src/common/util/goodies.c
+++ b/src/common/util/goodies.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include "goodies.h"
#include "unicode.h"
diff --git a/src/common/util/language.c b/src/common/util/language.c
index d95cfd595..424fb33b5 100644
--- a/src/common/util/language.c
+++ b/src/common/util/language.c
@@ -11,7 +11,7 @@
* This program may not be used, modified or distributed without
* prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "language.h"
#include "language_struct.h"
diff --git a/src/common/util/listbox.c b/src/common/util/listbox.c
index 9490068a7..508d5bd3c 100644
--- a/src/common/util/listbox.c
+++ b/src/common/util/listbox.c
@@ -8,8 +8,8 @@
*
*/
-/* wenn config.h nicht vor curses included wird, kompiliert es unter windows nicht */
-#include <config.h>
+/* wenn platform.h nicht vor curses included wird, kompiliert es unter windows nicht */
+#include <platform.h>
#include <curses.h>
#include "listbox.h"
diff --git a/src/common/util/lists.c b/src/common/util/lists.c
index 9bbfcbb4f..296978ed5 100644
--- a/src/common/util/lists.c
+++ b/src/common/util/lists.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <assert.h>
-#include <config.h>
+#include <platform.h>
#include "lists.h"
void
diff --git a/src/common/util/log.c b/src/common/util/log.c
index 51fdc50ee..7b5b22ff6 100644
--- a/src/common/util/log.c
+++ b/src/common/util/log.c
@@ -9,7 +9,7 @@
This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "log.h"
#include "unicode.h"
diff --git a/src/common/util/message.c b/src/common/util/message.c
index ae8346465..243b6ba40 100644
--- a/src/common/util/message.c
+++ b/src/common/util/message.c
@@ -11,7 +11,7 @@
*/
-#include <config.h>
+#include <platform.h>
#include "message.h"
#include "goodies.h"
diff --git a/src/common/util/nrmessage.c b/src/common/util/nrmessage.c
index ee7056145..5e36d350d 100644
--- a/src/common/util/nrmessage.c
+++ b/src/common/util/nrmessage.c
@@ -11,7 +11,7 @@
*/
-#include <config.h>
+#include <platform.h>
#include "nrmessage.h"
#include "nrmessage_struct.h"
diff --git a/src/common/util/parser.c b/src/common/util/parser.c
index 8ccd14143..1dfff3798 100644
--- a/src/common/util/parser.c
+++ b/src/common/util/parser.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include "parser.h"
#include "unicode.h"
#include "log.h"
diff --git a/src/common/util/patricia.c b/src/common/util/patricia.c
index 6208c34d1..4189f146b 100644
--- a/src/common/util/patricia.c
+++ b/src/common/util/patricia.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
#include <assert.h>
#include <stdlib.h>
diff --git a/src/common/util/rand.c b/src/common/util/rand.c
index 868af0738..5330d3e64 100644
--- a/src/common/util/rand.c
+++ b/src/common/util/rand.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include "rand.h"
#include "rng.h"
diff --git a/src/common/util/resolve.c b/src/common/util/resolve.c
index 6f7a58845..79376501b 100644
--- a/src/common/util/resolve.c
+++ b/src/common/util/resolve.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include <assert.h>
#include <stdlib.h>
#include "resolve.h"
diff --git a/src/common/util/sql.c b/src/common/util/sql.c
index 8b66cb113..88c8bed0a 100644
--- a/src/common/util/sql.c
+++ b/src/common/util/sql.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include "sql.h"
#include "log.h"
diff --git a/src/common/util/strings.c b/src/common/util/strings.c
index 715972c3c..4d5160c23 100644
--- a/src/common/util/strings.c
+++ b/src/common/util/strings.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
/* libc includes */
#include <string.h>
diff --git a/src/common/util/translation.c b/src/common/util/translation.c
index e14d3e51b..b92246a19 100644
--- a/src/common/util/translation.c
+++ b/src/common/util/translation.c
@@ -9,7 +9,7 @@
This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "translation.h"
#include "log.h"
diff --git a/src/common/util/umlaut.c b/src/common/util/umlaut.c
index 07a2f11f7..e260660eb 100644
--- a/src/common/util/umlaut.c
+++ b/src/common/util/umlaut.c
@@ -19,7 +19,7 @@
* permission from the authors.
*/
-#include <config.h>
+#include <platform.h>
#include "umlaut.h"
#include "log.h"
diff --git a/src/common/util/unicode.c b/src/common/util/unicode.c
index 09a91dfc9..adda90870 100644
--- a/src/common/util/unicode.c
+++ b/src/common/util/unicode.c
@@ -8,7 +8,7 @@
*
*/
-#include <config.h>
+#include <platform.h>
#include "unicode.h"
#include <errno.h>
diff --git a/src/common/util/xml.c b/src/common/util/xml.c
index 05c35b8ba..65b6fbaec 100644
--- a/src/common/util/xml.c
+++ b/src/common/util/xml.c
@@ -9,7 +9,7 @@
This program may not be used, modified or distributed
without prior permission by the authors of Eressea.
*/
-#include <config.h>
+#include <platform.h>
#include "xml.h"
/* util includes */
diff --git a/src/eressea.sln b/src/eressea.sln
index ba0219565..36d582cb1 100644
--- a/src/eressea.sln
+++ b/src/eressea.sln
@@ -4,19 +4,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel.vcp
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "eressea\editor.vcproj", "{D893D6B3-805D-9848-8EA4-CDA1B79151F6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "common\server.vcproj", "{D893D6B3-805D-9848-8EA4-CDA1B79151F6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea-lua", "eressea\eressea-lua.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
- ProjectSection(ProjectDependencies) = postProject
- {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D} = {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}
- {F70CFB27-8A2F-E447-B452-4E1C590EDA6D} = {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}
- {1E8BFF9E-3044-0742-992F-C5765B80FE65} = {1E8BFF9E-3044-0742-992F-C5765B80FE65}
- {D893D6B3-805D-9848-8EA4-CDA1B79151F6} = {D893D6B3-805D-9848-8EA4-CDA1B79151F6}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "common\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external", "external\external.vcproj", "{F9AE4586-8F65-486B-9666-744839E40A54}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build", "eressea\build.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
EndProject
Global
GlobalSection(SubversionScc) = preSolution
@@ -25,40 +21,30 @@ Global
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
- Profile|Win32 = Profile|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Debug|Win32.ActiveCfg = Debug|Win32
- {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Profile|Win32.ActiveCfg = Profile|Win32
- {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Profile|Win32.Build.0 = Profile|Win32
{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Release|Win32.ActiveCfg = Release|Win32
{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Release|Win32.Build.0 = Release|Win32
{1E8BFF9E-3044-0742-992F-C5765B80FE65}.Debug|Win32.ActiveCfg = Debug|Win32
- {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Profile|Win32.ActiveCfg = Profile|Win32
- {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Profile|Win32.Build.0 = Profile|Win32
{1E8BFF9E-3044-0742-992F-C5765B80FE65}.Release|Win32.ActiveCfg = Release|Win32
{1E8BFF9E-3044-0742-992F-C5765B80FE65}.Release|Win32.Build.0 = Release|Win32
{D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Debug|Win32.ActiveCfg = Debug|Win32
- {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Profile|Win32.ActiveCfg = Profile|Win32
- {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Profile|Win32.Build.0 = Profile|Win32
{D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Release|Win32.ActiveCfg = Release|Win32
{D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Release|Win32.Build.0 = Release|Win32
- {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.ActiveCfg = Debug|Win32
- {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.Build.0 = Debug|Win32
- {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Profile|Win32.ActiveCfg = Release|Win32
- {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Profile|Win32.Build.0 = Release|Win32
- {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.ActiveCfg = Release|Win32
{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Debug|Win32.ActiveCfg = Debug|Win32
- {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Profile|Win32.ActiveCfg = Profile|Win32
- {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Profile|Win32.Build.0 = Profile|Win32
{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.ActiveCfg = Release|Win32
{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.Build.0 = Release|Win32
{75501170-51C2-E641-BA8B-EDC008184192}.Debug|Win32.ActiveCfg = Debug|Win32
- {75501170-51C2-E641-BA8B-EDC008184192}.Profile|Win32.ActiveCfg = Profile|Win32
- {75501170-51C2-E641-BA8B-EDC008184192}.Profile|Win32.Build.0 = Profile|Win32
{75501170-51C2-E641-BA8B-EDC008184192}.Release|Win32.ActiveCfg = Release|Win32
{75501170-51C2-E641-BA8B-EDC008184192}.Release|Win32.Build.0 = Release|Win32
+ {F9AE4586-8F65-486B-9666-744839E40A54}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F9AE4586-8F65-486B-9666-744839E40A54}.Release|Win32.ActiveCfg = Release|Win32
+ {F9AE4586-8F65-486B-9666-744839E40A54}.Release|Win32.Build.0 = Release|Win32
+ {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.Build.0 = Debug|Win32
+ {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/eressea.vcproj b/src/eressea/build.vcproj
similarity index 78%
rename from src/eressea.vcproj
rename to src/eressea/build.vcproj
index 4a228ac58..1d11a98ec 100644
--- a/src/eressea.vcproj
+++ b/src/eressea/build.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="eressea"
+ Name="build"
ProjectGUID="{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
- RootNamespace="eressealump"
+ RootNamespace="build"
SccProjectName="Svn"
SccAuxPath="Svn"
SccLocalPath="Svn"
@@ -45,7 +45,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
- AdditionalIncludeDirectories=".;common;external"
+ AdditionalIncludeDirectories="..;../common;../external"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;common;external"
+ AdditionalIncludeDirectories="..;../common;../external"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@@ -187,23 +187,27 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\combined\curses.c"
+ RelativePath="..\common\build\curses.c"
>
</File>
<File
- RelativePath=".\combined\gamecode.c"
+ RelativePath="..\common\build\external.c"
>
</File>
<File
- RelativePath=".\combined\kernel.c"
+ RelativePath="..\common\build\gamecode.c"
>
</File>
<File
- RelativePath=".\combined\main.c"
+ RelativePath="..\common\build\kernel.c"
>
</File>
<File
- RelativePath=".\combined\stdafx.c"
+ RelativePath=".\server.c"
+ >
+ </File>
+ <File
+ RelativePath="..\common\build\stdafx.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -224,7 +228,7 @@
</FileConfiguration>
</File>
<File
- RelativePath=".\combined\util.c"
+ RelativePath="..\common\build\util.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -242,42 +246,10 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath=".\combined\stdafx.h"
+ RelativePath="..\common\build\stdafx.h"
>
</File>
</Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath=".\scripts\default.lua"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="luac -o $(IntDir)/$(InputName).luac $(InputPath)
"
- Outputs="$(IntDir)/$(InputName).luac"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\scripts\eressea.lua"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="luac -o $(IntDir)/$(InputName).luac $(InputPath)
"
- Outputs="$(IntDir)/$(InputName).luac"
- />
- </FileConfiguration>
- </File>
- </Filter>
</Files>
<Globals>
</Globals>
diff --git a/src/eressea/editor.vcproj b/src/eressea/editor.vcproj
deleted file mode 100644
index 265aa2cac..000000000
--- a/src/eressea/editor.vcproj
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="editor"
- ProjectGUID="{D893D6B3-805D-9848-8EA4-CDA1B79151F6}"
- RootNamespace="editor"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug/editor"
- IntermediateDirectory="Debug/editor"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
- Optimization="0"
- AdditionalIncludeDirectories="..;../common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- AdditionalIncludeDirectories="..;../common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/editor.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Profile|Win32"
- OutputDirectory="Profile/editor"
- IntermediateDirectory="Profile/editor"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..;../common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- AdditionalIncludeDirectories="..;../common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/editor.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release/editor"
- IntermediateDirectory="Release/editor"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- AdditionalIncludeDirectories="..;../common"
- 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"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/editor.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="curses"
- >
- <File
- RelativePath=".\curses\listbox.c"
- >
- </File>
- <File
- RelativePath=".\curses\listbox.h"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\editing.c"
- >
- </File>
- <File
- RelativePath=".\editing.h"
- >
- </File>
- <File
- RelativePath=".\gmtool.c"
- >
- </File>
- <File
- RelativePath=".\gmtool.h"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/src/eressea/eressea-lua.vcproj b/src/eressea/eressea-lua.vcproj
deleted file mode 100644
index cd5369a04..000000000
--- a/src/eressea/eressea-lua.vcproj
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="eressea-lua"
- ProjectGUID="{75501170-51C2-E641-BA8B-EDC008184192}"
- RootNamespace="eressea-lua"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
- Optimization="0"
- AdditionalIncludeDirectories="..;../common;../external"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- AdditionalIncludeDirectories="..;../common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libxml2.lib pdcurses.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="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Profile|Win32"
- OutputDirectory="Profile"
- IntermediateDirectory="Profile"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..;../common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- AdditionalIncludeDirectories="..;../common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="../common/Profile/util/util.lib ../common/Profile/kernel/kernel.lib ../common/Profile/gamecode/gamecode.lib lua/Profile/bindings/bindings.lib Profile/editor/editor.lib libxml2.lib pdcurses.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="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- 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;../external"
- 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"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="../common/Release/util/util.lib ../common/Release/kernel/kernel.lib ../common/Release/gamecode/gamecode.lib lua/Release/bindings/bindings.lib Release/editor/editor.lib libxml2.lib pdcurses.lib lua5.1.lib luabind.lib"
- OutputFile="$(OutDir)/eressea-lua.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="tolua"
- >
- <File
- RelativePath=".\tolua\bind_attrib.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_attrib.h"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_building.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_building.h"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_faction.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_faction.h"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_gmtool.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_gmtool.h"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_hashtable.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_hashtable.h"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_message.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_message.h"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_region.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_region.h"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_ship.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_ship.h"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_sqlite.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_storage.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_storage.h"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_unit.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bind_unit.h"
- >
- </File>
- <File
- RelativePath=".\tolua\bindings.c"
- >
- </File>
- <File
- RelativePath=".\tolua\bindings.h"
- >
- </File>
- <File
- RelativePath=".\tolua\helpers.c"
- >
- </File>
- <File
- RelativePath=".\tolua\helpers.h"
- >
- </File>
- </Filter>
- <Filter
- Name="external"
- >
- <File
- RelativePath="..\external\bson\bson.c"
- >
- </File>
- <File
- RelativePath="..\external\bson\bson.h"
- >
- </File>
- <File
- RelativePath="..\external\md5.c"
- >
- </File>
- <File
- RelativePath="..\external\md5.h"
- >
- </File>
- <File
- RelativePath="..\external\bson\numbers.c"
- >
- </File>
- <File
- RelativePath="..\external\bson\platform_hacks.h"
- >
- </File>
- <File
- RelativePath="..\external\sqlite3.c"
- >
- </File>
- <File
- RelativePath="..\external\sqlite3.h"
- >
- </File>
- <File
- RelativePath="..\external\sqlite3ext.h"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\console.c"
- >
- </File>
- <File
- RelativePath=".\console.h"
- >
- </File>
- <File
- RelativePath=".\Jamfile"
- >
- </File>
- <File
- RelativePath=".\server.c"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/src/eressea/server.c b/src/eressea/server.c
index 685c060bd..3a1b7e653 100644
--- a/src/eressea/server.c
+++ b/src/eressea/server.c
@@ -20,11 +20,11 @@
*/
/* config includes */
-#include <config.h>
+#include <platform.h>
+#include "stdafx.h"
#include <kernel/eressea.h>
-#include "console.h"
-#include "gmtool.h"
+#include <gmtool.h>
/* initialization - TODO: init in separate module */
#include <attributes/attributes.h>
@@ -83,6 +83,7 @@
/* util includes */
#include <util/base36.h>
+#include <util/console.h>
#include <util/language.h>
#include <util/goodies.h>
#include <util/log.h>
@@ -101,18 +102,18 @@
#include <lua.h>
#include <lualib.h>
#include <lauxlib.h>
-#include "tolua/bindings.h"
-#include "tolua/helpers.h"
-#include "tolua/bind_attrib.h"
-#include "tolua/bind_building.h"
-#include "tolua/bind_faction.h"
-#include "tolua/bind_gmtool.h"
-#include "tolua/bind_hashtable.h"
-#include "tolua/bind_message.h"
-#include "tolua/bind_region.h"
-#include "tolua/bind_ship.h"
-#include "tolua/bind_storage.h"
-#include "tolua/bind_unit.h"
+#include <bindings/bindings.h>
+#include <bindings/helpers.h>
+#include <bindings/bind_attrib.h>
+#include <bindings/bind_building.h>
+#include <bindings/bind_faction.h>
+#include <bindings/bind_gmtool.h>
+#include <bindings/bind_hashtable.h>
+#include <bindings/bind_message.h>
+#include <bindings/bind_region.h>
+#include <bindings/bind_ship.h>
+#include <bindings/bind_storage.h>
+#include <bindings/bind_unit.h>
#endif // BINDINGS_TOLUA
#ifdef BINDINGS_LUABIND
diff --git a/src/common/util/dl/malloc.c b/src/external/dlmalloc/malloc.c
similarity index 100%
rename from src/common/util/dl/malloc.c
rename to src/external/dlmalloc/malloc.c
diff --git a/src/common/util/dl/malloc.h b/src/external/dlmalloc/malloc.h
similarity index 100%
rename from src/common/util/dl/malloc.h
rename to src/external/dlmalloc/malloc.h
diff --git a/src/common/iniparser/iniparser.c b/src/external/iniparser/iniparser.c
similarity index 99%
rename from src/common/iniparser/iniparser.c
rename to src/external/iniparser/iniparser.c
index 28d8f73bf..acdbf1797 100644
--- a/src/common/iniparser/iniparser.c
+++ b/src/external/iniparser/iniparser.c
@@ -28,7 +28,7 @@
*/
-#include <config.h>
+#include <platform.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/common/iniparser/iniparser.h b/src/external/iniparser/iniparser.h
similarity index 100%
rename from src/common/iniparser/iniparser.h
rename to src/external/iniparser/iniparser.h
diff --git a/src/common/util/mt19937ar.c b/src/external/mt19937ar.c
similarity index 100%
rename from src/common/util/mt19937ar.c
rename to src/external/mt19937ar.c
diff --git a/src/external/sqlite3.c b/src/external/sqlite3.c
index 91422d30e..3eab0e651 100644
--- a/src/external/sqlite3.c
+++ b/src/external/sqlite3.c
@@ -75,7 +75,7 @@
** autoconf-based build
*/
#ifdef _HAVE_SQLITE_CONFIG_H
-#include "config.h"
+#include "platform.h"
#endif
/************** Include sqliteLimit.h in the middle of sqliteInt.h ***********/
diff --git a/src/common/config.h b/src/platform.h
similarity index 100%
rename from src/common/config.h
rename to src/platform.h
diff --git a/src/stdafx.h b/src/stdafx.h
deleted file mode 100644
index 187ac2cc3..000000000
--- a/src/stdafx.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* vi: set ts=2:
- +-------------------+ Christian Schlittchen <corwin@amber.kn-bremen.de>
- | | Enno Rehling <enno@eressea-pbem.de>
- | Eressea PBEM host | Katja Zedel <katze@felidae.kn-bremen.de>
- | (c) 1998 - 2001 | Henning Peters <faroul@beyond.kn-bremen.de>
- | | Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
- +-------------------+ Stefan Reich <reich@halbling.de>
-
- This program may not be used, modified or distributed
- without prior permission by the authors of Eressea.
-*/
-#if !defined(AFX_STDAFX_H__FE6139E7_C2CB_11D2_8C39_A27E32099752__INCLUDED_)
-#define AFX_STDAFX_H__FE6139E7_C2CB_11D2_8C39_A27E32099752__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif
-
-#define VC_EXTRALEAN /* Selten verwendete Teile der Windows-Header nicht einbinden */
-
-#endif
diff --git a/src/vc9/bindings.vcproj b/src/vc9/bindings.vcproj
deleted file mode 100644
index 3e1835646..000000000
--- a/src/vc9/bindings.vcproj
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="bindings"
- ProjectGUID="{74B1CBD4-3B6E-E544-9475-33FBB0BCE165}"
- RootNamespace="bindings"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug/bindings"
- IntermediateDirectory="Debug/bindings"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..;../common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- AdditionalIncludeDirectories="..;../common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/bindings.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release/bindings"
- IntermediateDirectory="Release/bindings"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- AdditionalIncludeDirectories="..;../common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- DebugInformationFormat="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- AdditionalIncludeDirectories="..;../common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/bindings.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\eressea\lua\alliance.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\bindings.h"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\building.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\eressea.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\event.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\event.h"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\export.h"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\faction.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\gamecode.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\item.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\list.h"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\message.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\objects.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\objects.h"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\region.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\script.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\script.h"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\ship.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\spell.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\test.cpp"
- >
- </File>
- <File
- RelativePath="..\eressea\lua\unit.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/src/vc9/codegen.vcproj b/src/vc9/codegen.vcproj
deleted file mode 100644
index d08f1b0e4..000000000
--- a/src/vc9/codegen.vcproj
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="codegen"
- ProjectGUID="{BEF9E49F-3E98-4CE7-B641-62456E656E34}"
- RootNamespace="codegen"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit) libxml2.lib "
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="kernel32.lib $(NoInherit)"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\codegen.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath="..\..\eressea\tolua\message.xml"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\ReadMe.txt"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/src/vc9/eressea.sln b/src/vc9/eressea.sln
deleted file mode 100644
index 3f23321d2..000000000
--- a/src/vc9/eressea.sln
+++ /dev/null
@@ -1,54 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bindings", "bindings.vcproj", "{74B1CBD4-3B6E-E544-9475-33FBB0BCE165}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "editor.vcproj", "{D893D6B3-805D-9848-8EA4-CDA1B79151F6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea-lua", "eressea-lua.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}"
- ProjectSection(ProjectDependencies) = postProject
- {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D} = {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}
- {F70CFB27-8A2F-E447-B452-4E1C590EDA6D} = {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}
- {1E8BFF9E-3044-0742-992F-C5765B80FE65} = {1E8BFF9E-3044-0742-992F-C5765B80FE65}
- {D893D6B3-805D-9848-8EA4-CDA1B79151F6} = {D893D6B3-805D-9848-8EA4-CDA1B79151F6}
- {74B1CBD4-3B6E-E544-9475-33FBB0BCE165} = {74B1CBD4-3B6E-E544-9475-33FBB0BCE165}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eressea", "eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Debug|Win32.ActiveCfg = Debug|Win32
- {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.ActiveCfg = Release|Win32
- {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Debug|Win32.ActiveCfg = Debug|Win32
- {6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}.Release|Win32.ActiveCfg = Release|Win32
- {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Debug|Win32.ActiveCfg = Debug|Win32
- {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Release|Win32.ActiveCfg = Release|Win32
- {74B1CBD4-3B6E-E544-9475-33FBB0BCE165}.Debug|Win32.ActiveCfg = Debug|Win32
- {74B1CBD4-3B6E-E544-9475-33FBB0BCE165}.Release|Win32.ActiveCfg = Release|Win32
- {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Debug|Win32.ActiveCfg = Debug|Win32
- {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Release|Win32.ActiveCfg = Release|Win32
- {75501170-51C2-E641-BA8B-EDC008184192}.Debug|Win32.ActiveCfg = Debug|Win32
- {75501170-51C2-E641-BA8B-EDC008184192}.Release|Win32.ActiveCfg = Release|Win32
- {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.ActiveCfg = Debug|Win32
- {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Debug|Win32.Build.0 = Debug|Win32
- {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.ActiveCfg = Release|Win32
- {AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(SubversionScc) = preSolution
- Svn-Managed = True
- Manager = AnkhSVN - Subversion Support for Visual Studio
- EndGlobalSection
-EndGlobal
diff --git a/src/vc9/eressea.vcproj b/src/vc9/eressea.vcproj
deleted file mode 100644
index 4e73e7cfe..000000000
--- a/src/vc9/eressea.vcproj
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="eressea"
- ProjectGUID="{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
- RootNamespace="eressealump"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..;../common"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="2"
- PrecompiledHeaderThrough="stdafx.h"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libxml2.lib pdcurses.lib lua5.1_d.lib tolua.lib"
- OutputFile="$(OutDir)\eressea.exe"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- AdditionalIncludeDirectories="..;../common"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="2"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libxml2.lib pdcurses.lib lua5.1.lib tolua.lib"
- OutputFile="$(OutDir)\eressea.exe"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\combined\bindings.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PrecompiledHeaderThrough="stdafx.hpp"
- PrecompiledHeaderFile="$(IntDir)\$(TargetName)_cpp.pch"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PrecompiledHeaderThrough="stdafx.hpp"
- PrecompiledHeaderFile="$(IntDir)\$(TargetName)_cpp.pch"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\combined\curses.c"
- >
- </File>
- <File
- RelativePath="..\combined\gamecode.c"
- >
- </File>
- <File
- RelativePath="..\combined\kernel.c"
- >
- </File>
- <File
- RelativePath="..\combined\stdafx.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.h"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\combined\stdafx.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.hpp"
- PrecompiledHeaderFile="$(IntDir)\$(TargetName)_cpp.pch"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- PrecompiledHeaderThrough="stdafx.hpp"
- PrecompiledHeaderFile="$(IntDir)\$(TargetName)_cpp.pch"
- ObjectFile="$(IntDir)\$(InputName)1.obj"
- XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\combined\util.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../common/util"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\common\settings-eressea.h"
- >
- </File>
- <File
- RelativePath="..\combined\stdafx.h"
- >
- </File>
- <File
- RelativePath="..\combined\stdafx.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/src/vc9/gamecode.vcproj b/src/vc9/gamecode.vcproj
deleted file mode 100644
index 85a55b557..000000000
--- a/src/vc9/gamecode.vcproj
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="gamecode"
- ProjectGUID="{1E8BFF9E-3044-0742-992F-C5765B80FE65}"
- RootNamespace="gamecode"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug/gamecode"
- IntermediateDirectory="Debug/gamecode"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- AdditionalIncludeDirectories="..\common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/gamecode.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release/gamecode"
- IntermediateDirectory="Release/gamecode"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- AdditionalIncludeDirectories="..\common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- DebugInformationFormat="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- AdditionalIncludeDirectories="..\common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/gamecode.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="gamecode"
- >
- <File
- RelativePath="..\common\gamecode\archetype.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\archetype.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\creation.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\creation.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\creport.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\creport.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\economy.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\economy.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\give.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\give.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\items.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\items.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\laws.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\laws.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\luck.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\luck.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\monster.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\monster.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\randenc.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\randenc.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\report.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\report.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\spells.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\spells.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\spy.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\spy.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\study.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\study.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\summary.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\summary.h"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\xmlreport.c"
- >
- </File>
- <File
- RelativePath="..\common\gamecode\xmlreport.h"
- >
- </File>
- </Filter>
- <Filter
- Name="races"
- >
- <File
- RelativePath="..\common\races\dragons.c"
- >
- </File>
- <File
- RelativePath="..\common\races\dragons.h"
- >
- </File>
- <File
- RelativePath="..\common\races\illusion.c"
- >
- </File>
- <File
- RelativePath="..\common\races\illusion.h"
- >
- </File>
- <File
- RelativePath="..\common\races\races.c"
- >
- </File>
- <File
- RelativePath="..\common\races\races.h"
- >
- </File>
- <File
- RelativePath="..\common\races\zombies.c"
- >
- </File>
- <File
- RelativePath="..\common\races\zombies.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/src/vc9/kernel.vcproj b/src/vc9/kernel.vcproj
deleted file mode 100644
index 6698fe5e5..000000000
--- a/src/vc9/kernel.vcproj
+++ /dev/null
@@ -1,1030 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="kernel"
- ProjectGUID="{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}"
- RootNamespace="kernel"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug/kernel"
- IntermediateDirectory="Debug/kernel"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../common/kernel;../common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- AdditionalIncludeDirectories="../common/kernel;../common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/kernel.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release/kernel"
- IntermediateDirectory="Release/kernel"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- AdditionalIncludeDirectories="../common/kernel;../common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- DebugInformationFormat="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- AdditionalIncludeDirectories="../common/kernel;../common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/kernel.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="kernel"
- >
- <File
- RelativePath="..\common\kernel\alchemy.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\alchemy.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\alliance.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\alliance.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\battle.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\battle.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\binarystore.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\binarystore.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\border.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\border.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\build.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\build.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\building.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\building.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\calendar.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\calendar.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\command.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\command.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\curse.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\curse.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\equipment.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\equipment.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\eressea.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\eressea.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\faction.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\faction.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\group.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\group.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\item.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\item.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\karma.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\karma.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\magic.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\magic.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\message.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\message.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\move.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\move.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\names.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\names.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\objtypes.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\order.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\order.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\pathfinder.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\pathfinder.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\plane.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\plane.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\player.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\player.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\pool.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\pool.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\race.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\race.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\region.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\region.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\render.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\reports.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\reports.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\resources.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\resources.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\save.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\save.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\ship.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\ship.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\skill.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\skill.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\spell.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\spell.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\spellid.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\teleport.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\teleport.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\terrain.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\terrain.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\terrainid.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\textstore.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\textstore.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\types.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\unit.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\unit.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\version.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\xmlkernel.h"
- >
- </File>
- <File
- RelativePath="..\common\kernel\xmlreader.c"
- >
- </File>
- <File
- RelativePath="..\common\kernel\xmlreader.h"
- >
- </File>
- </Filter>
- <Filter
- Name="triggers"
- >
- <File
- RelativePath="..\common\triggers\changefaction.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\changefaction.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\changerace.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\changerace.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\clonedied.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\clonedied.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\createcurse.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\createcurse.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\createunit.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\createunit.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\gate.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\gate.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\giveitem.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\giveitem.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\killunit.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\killunit.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\removecurse.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\removecurse.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\shock.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\shock.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\timeout.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\timeout.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\triggers.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\triggers.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\unguard.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\unguard.h"
- >
- </File>
- <File
- RelativePath="..\common\triggers\unitmessage.c"
- >
- </File>
- <File
- RelativePath="..\common\triggers\unitmessage.h"
- >
- </File>
- </Filter>
- <Filter
- Name="spells"
- >
- <File
- RelativePath="..\common\spells\alp.c"
- >
- </File>
- <File
- RelativePath="..\common\spells\alp.h"
- >
- </File>
- <File
- RelativePath="..\common\spells\buildingcurse.c"
- >
- </File>
- <File
- RelativePath="..\common\spells\buildingcurse.h"
- >
- </File>
- <File
- RelativePath="..\common\spells\combatspells.c"
- >
- </File>
- <File
- RelativePath="..\common\spells\combatspells.h"
- >
- </File>
- <File
- RelativePath="..\common\spells\regioncurse.c"
- >
- </File>
- <File
- RelativePath="..\common\spells\regioncurse.h"
- >
- </File>
- <File
- RelativePath="..\common\spells\shipcurse.c"
- >
- </File>
- <File
- RelativePath="..\common\spells\shipcurse.h"
- >
- </File>
- <File
- RelativePath="..\common\spells\spells.c"
- >
- </File>
- <File
- RelativePath="..\common\spells\spells.h"
- >
- </File>
- <File
- RelativePath="..\common\spells\unitcurse.c"
- >
- </File>
- <File
- RelativePath="..\common\spells\unitcurse.h"
- >
- </File>
- </Filter>
- <Filter
- Name="items"
- >
- <File
- RelativePath="..\common\items\artrewards.c"
- >
- </File>
- <File
- RelativePath="..\common\items\artrewards.h"
- >
- </File>
- <File
- RelativePath="..\common\items\demonseye.c"
- >
- </File>
- <File
- RelativePath="..\common\items\demonseye.h"
- >
- </File>
- <File
- RelativePath="..\common\items\itemtypes.c"
- >
- </File>
- <File
- RelativePath="..\common\items\itemtypes.h"
- >
- </File>
- <File
- RelativePath="..\common\items\phoenixcompass.c"
- >
- </File>
- <File
- RelativePath="..\common\items\phoenixcompass.h"
- >
- </File>
- <File
- RelativePath="..\common\items\seed.c"
- >
- </File>
- <File
- RelativePath="..\common\items\seed.h"
- >
- </File>
- <File
- RelativePath="..\common\items\speedsail.c"
- >
- </File>
- <File
- RelativePath="..\common\items\speedsail.h"
- >
- </File>
- <File
- RelativePath="..\common\items\weapons.c"
- >
- </File>
- <File
- RelativePath="..\common\items\weapons.h"
- >
- </File>
- <File
- RelativePath="..\common\items\xerewards.c"
- >
- </File>
- <File
- RelativePath="..\common\items\xerewards.h"
- >
- </File>
- </Filter>
- <Filter
- Name="modules"
- >
- <File
- RelativePath="..\common\modules\arena.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\arena.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\autoseed.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\autoseed.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\dungeon.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\dungeon.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\gmcmd.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\gmcmd.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\infocmd.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\infocmd.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\museum.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\museum.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\oceannames.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\oceannames.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\score.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\score.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\weather.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\weather.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\wormhole.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\wormhole.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\xecmd.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\xecmd.h"
- >
- </File>
- <File
- RelativePath="..\common\modules\xmas.c"
- >
- </File>
- <File
- RelativePath="..\common\modules\xmas.h"
- >
- </File>
- </Filter>
- <Filter
- Name="attributes"
- >
- <File
- RelativePath="..\common\attributes\aggressive.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\alliance.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\alliance.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\attributes.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\attributes.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\fleechance.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\fleechance.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\follow.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\follow.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\giveitem.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\giveitem.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\gm.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\gm.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\hate.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\hate.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\iceberg.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\iceberg.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\key.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\key.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\matmod.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\matmod.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\moved.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\moved.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\movement.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\movement.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\object.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\object.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\option.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\option.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\orcification.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\orcification.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\otherfaction.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\otherfaction.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\overrideroads.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\overrideroads.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\racename.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\racename.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\raceprefix.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\raceprefix.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\reduceproduction.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\reduceproduction.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\targetregion.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\targetregion.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\variable.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\variable.h"
- >
- </File>
- <File
- RelativePath="..\common\attributes\viewrange.c"
- >
- </File>
- <File
- RelativePath="..\common\attributes\viewrange.h"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/src/vc9/util.vcproj b/src/vc9/util.vcproj
deleted file mode 100644
index 63e5492c0..000000000
--- a/src/vc9/util.vcproj
+++ /dev/null
@@ -1,402 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="util"
- ProjectGUID="{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}"
- RootNamespace="util"
- Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug/util"
- IntermediateDirectory="Debug/util"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../common/util;../common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- WarnAsError="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
- AdditionalIncludeDirectories="../common/util;../common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/util.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release/util"
- IntermediateDirectory="Release/util"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="3"
- AdditionalIncludeDirectories="../common/util;../common"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- DebugInformationFormat="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
- AdditionalIncludeDirectories="../common/util;../common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)/util.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="util"
- >
- <File
- RelativePath="..\common\util\attrib.c"
- >
- </File>
- <File
- RelativePath="..\common\util\attrib.h"
- >
- </File>
- <File
- RelativePath="..\common\util\base36.c"
- >
- </File>
- <File
- RelativePath="..\common\util\base36.h"
- >
- </File>
- <File
- RelativePath="..\common\util\bsdstring.c"
- >
- </File>
- <File
- RelativePath="..\common\util\bsdstring.h"
- >
- </File>
- <File
- RelativePath="..\common\util\crmessage.c"
- >
- </File>
- <File
- RelativePath="..\common\util\crmessage.h"
- >
- </File>
- <File
- RelativePath="..\common\util\cvector.c"
- >
- </File>
- <File
- RelativePath="..\common\util\cvector.h"
- >
- </File>
- <File
- RelativePath="..\common\util\dice.c"
- >
- </File>
- <File
- RelativePath="..\common\util\event.c"
- >
- </File>
- <File
- RelativePath="..\common\util\event.h"
- >
- </File>
- <File
- RelativePath="..\common\util\filereader.c"
- >
- </File>
- <File
- RelativePath="..\common\util\filereader.h"
- >
- </File>
- <File
- RelativePath="..\common\util\functions.c"
- >
- </File>
- <File
- RelativePath="..\common\util\functions.h"
- >
- </File>
- <File
- RelativePath="..\common\util\goodies.c"
- >
- </File>
- <File
- RelativePath="..\common\util\goodies.h"
- >
- </File>
- <File
- RelativePath="..\common\util\language.c"
- >
- </File>
- <File
- RelativePath="..\common\util\language.h"
- >
- </File>
- <File
- RelativePath="..\common\util\language_struct.h"
- >
- </File>
- <File
- RelativePath="..\common\util\lists.c"
- >
- </File>
- <File
- RelativePath="..\common\util\lists.h"
- >
- </File>
- <File
- RelativePath="..\common\util\log.c"
- >
- </File>
- <File
- RelativePath="..\common\util\log.h"
- >
- </File>
- <File
- RelativePath="..\common\util\message.c"
- >
- </File>
- <File
- RelativePath="..\common\util\message.h"
- >
- </File>
- <File
- RelativePath="..\common\util\mt19937ar.c"
- >
- </File>
- <File
- RelativePath="..\common\util\nrmessage.c"
- >
- </File>
- <File
- RelativePath="..\common\util\nrmessage.h"
- >
- </File>
- <File
- RelativePath="..\common\util\nrmessage_struct.h"
- >
- </File>
- <File
- RelativePath="..\common\util\parser.c"
- >
- </File>
- <File
- RelativePath="..\common\util\parser.h"
- >
- </File>
- <File
- RelativePath="..\common\util\patricia.c"
- >
- </File>
- <File
- RelativePath="..\common\util\patricia.h"
- >
- </File>
- <File
- RelativePath="..\common\util\rand.c"
- >
- </File>
- <File
- RelativePath="..\common\util\rand.h"
- >
- </File>
- <File
- RelativePath="..\common\util\resolve.c"
- >
- </File>
- <File
- RelativePath="..\common\util\resolve.h"
- >
- </File>
- <File
- RelativePath="..\common\util\rng.h"
- >
- </File>
- <File
- RelativePath="..\common\util\sql.c"
- >
- </File>
- <File
- RelativePath="..\common\util\sql.h"
- >
- </File>
- <File
- RelativePath="..\common\util\storage.h"
- >
- </File>
- <File
- RelativePath="..\common\util\strings.c"
- >
- </File>
- <File
- RelativePath="..\common\util\translation.c"
- >
- </File>
- <File
- RelativePath="..\common\util\translation.h"
- >
- </File>
- <File
- RelativePath="..\common\util\umlaut.c"
- >
- </File>
- <File
- RelativePath="..\common\util\umlaut.h"
- >
- </File>
- <File
- RelativePath="..\common\util\unicode.c"
- >
- </File>
- <File
- RelativePath="..\common\util\unicode.h"
- >
- </File>
- <File
- RelativePath="..\common\util\variant.h"
- >
- </File>
- <File
- RelativePath="..\common\util\xml.c"
- >
- </File>
- <File
- RelativePath="..\common\util\xml.h"
- >
- </File>
- </Filter>
- <Filter
- Name="iniparser"
- >
- <File
- RelativePath="..\common\iniparser\iniparser.c"
- >
- </File>
- <File
- RelativePath="..\common\iniparser\iniparser.h"
- >
- </File>
- </Filter>
- <File
- RelativePath="..\common\config.h"
- >
- </File>
- <File
- RelativePath="..\common\util\dl\malloc.h"
- >
- </File>
- <File
- RelativePath="..\common\settings.h"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>