fixed the unity build (somewhat)

renamed config.h -> platform.h
forced to change a lot of includes

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"
 

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"
 

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>

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>

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>
 

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"
 

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"
 

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"
 

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"
 

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>

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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>

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>

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>

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"
 

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 */

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>
 

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"
 

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"

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>

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>

src/common/bindings/bind_message.c

@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
 #include <kernel/eressea.h>
 
 // kernel includes

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"

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"
 

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"

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"
 

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"

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

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>

src/common/build/Jamfile

@@ -32,7 +32,7 @@ SERVER_SOURCES =
  kernel.c
  stdafx.c
  util.c
- main.c
+ external.c
 ;
 
 CCFLAGS += -DSQLITE_THREADSAFE=0 ;

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>

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>

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>

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>

src/common/build/stdafx.h

@@ -1,2 +1,2 @@
 #include "common/settings.h"
-#include "common/config.h"
+#include <platform.h>

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

src/common/editing.c

@@ -8,7 +8,7 @@
  *  
  */
 
-#include <config.h>
+#include <platform.h>
 #include <kernel/eressea.h>
 #include "editing.h"
 

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"

src/common/gamecode/archetype.c

@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
 #include <kernel/eressea.h>
 #include "archetype.h"
 

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"

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"
 

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"
 

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"
 

src/common/gamecode/items.c

@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
 #include <kernel/eressea.h>
 #include "items.h"
 

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"
 

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"

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"
 

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"
 

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"
 

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 */

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"
 

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"
 

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"
 

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"

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"
 

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>

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"
 

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"
 

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"
 

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"
 

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"

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"
 

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"
 

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"
 

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"

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"
 

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"
 

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"
 

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"
 

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"
 

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"

src/common/kernel/calendar.c

@@ -1,4 +1,4 @@
-#include <config.h>
+#include <platform.h>
 #include "calendar.h"
 
 #include <assert.h>

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"
 

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"
 

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"
 

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"
 

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 */

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) */

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"
 

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"
 

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"
 

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"

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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>

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"
 

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"
 

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"