From 2acf1655745c565308cc54e3aebc21fae9020321 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 26 Feb 2010 06:35:40 +0000 Subject: [PATCH] --- src/all.sln | 10 +++++----- src/basic/basic.sln | 16 ++++++++++----- src/basic/basic.vcproj | 20 +++++++++---------- src/common/build/external.c | 12 ----------- src/common/build/stdafx.h | 2 -- src/eressea/eressea.sln | 19 ++++++++++-------- src/eressea/eressea.vcproj | 20 +++++++++---------- src/external/external.vcproj | 12 +++++++++-- src/{common => src}/Jamfile | 0 src/{common => src}/attributes/Jamfile | 0 src/{common => src}/attributes/aggressive.h | 0 src/{common => src}/attributes/alliance.c | 0 src/{common => src}/attributes/alliance.h | 0 src/{common => src}/attributes/attributes.c | 0 src/{common => src}/attributes/attributes.h | 0 src/{common => src}/attributes/fleechance.c | 0 src/{common => src}/attributes/fleechance.h | 0 src/{common => src}/attributes/follow.c | 0 src/{common => src}/attributes/follow.h | 0 src/{common => src}/attributes/giveitem.c | 0 src/{common => src}/attributes/giveitem.h | 0 src/{common => src}/attributes/gm.c | 0 src/{common => src}/attributes/gm.h | 0 src/{common => src}/attributes/hate.c | 0 src/{common => src}/attributes/hate.h | 0 src/{common => src}/attributes/iceberg.c | 0 src/{common => src}/attributes/iceberg.h | 0 src/{common => src}/attributes/key.c | 0 src/{common => src}/attributes/key.h | 0 src/{common => src}/attributes/matmod.c | 0 src/{common => src}/attributes/matmod.h | 0 src/{common => src}/attributes/moved.c | 0 src/{common => src}/attributes/moved.h | 0 src/{common => src}/attributes/movement.c | 0 src/{common => src}/attributes/movement.h | 0 src/{common => src}/attributes/object.c | 0 src/{common => src}/attributes/object.h | 0 src/{common => src}/attributes/orcification.c | 0 src/{common => src}/attributes/orcification.h | 0 src/{common => src}/attributes/otherfaction.c | 0 src/{common => src}/attributes/otherfaction.h | 0 .../attributes/overrideroads.c | 0 .../attributes/overrideroads.h | 0 src/{common => src}/attributes/racename.c | 0 src/{common => src}/attributes/racename.h | 0 src/{common => src}/attributes/raceprefix.c | 0 src/{common => src}/attributes/raceprefix.h | 0 .../attributes/reduceproduction.c | 0 .../attributes/reduceproduction.h | 0 src/{common => src}/attributes/targetregion.c | 0 src/{common => src}/attributes/targetregion.h | 0 src/{common => src}/attributes/viewrange.c | 0 src/{common => src}/attributes/viewrange.h | 0 src/{common => src}/bindings/bind_attrib.c | 0 src/{common => src}/bindings/bind_attrib.h | 0 src/{common => src}/bindings/bind_building.c | 0 src/{common => src}/bindings/bind_building.h | 0 src/{common => src}/bindings/bind_faction.c | 0 src/{common => src}/bindings/bind_faction.h | 0 src/{common => src}/bindings/bind_gmtool.c | 0 src/{common => src}/bindings/bind_gmtool.h | 0 src/{common => src}/bindings/bind_hashtable.c | 0 src/{common => src}/bindings/bind_hashtable.h | 0 src/{common => src}/bindings/bind_message.c | 0 src/{common => src}/bindings/bind_message.h | 0 src/{common => src}/bindings/bind_region.c | 0 src/{common => src}/bindings/bind_region.h | 0 src/{common => src}/bindings/bind_ship.c | 0 src/{common => src}/bindings/bind_ship.h | 0 src/{common => src}/bindings/bind_sqlite.c | 0 src/{common => src}/bindings/bind_storage.c | 0 src/{common => src}/bindings/bind_storage.h | 0 src/{common => src}/bindings/bind_unit.c | 0 src/{common => src}/bindings/bind_unit.h | 0 src/{common => src}/bindings/bindings.c | 0 src/{common => src}/bindings/bindings.h | 0 src/{common => src}/bindings/helpers.c | 3 ++- src/{common => src}/bindings/helpers.h | 0 src/{common => src}/build/Copy of curses.c | 0 src/{common => src}/build/Jamfile | 0 src/{common => src}/build/atoi36.c | 0 src/src/build/external.c | 12 +++++++++++ src/{common => src}/build/gamecode.c | 0 src/{common => src}/build/kernel.c | 0 src/{common => src}/build/lib.c | 2 +- src/{common => src}/build/malloc.c | 0 src/{common => src}/build/stdafx.c | 0 src/src/build/stdafx.h | 2 ++ src/{common => src}/build/util.c | 4 ++-- src/{common => src}/eressea.c | 0 src/{common => src}/eressea.h | 0 src/{common => src}/gamecode.vcproj | 4 ++-- src/{common => src}/gamecode/Jamfile | 0 src/{common => src}/gamecode/archetype.c | 0 src/{common => src}/gamecode/archetype.h | 0 src/{common => src}/gamecode/creation.c | 0 src/{common => src}/gamecode/creation.h | 0 src/{common => src}/gamecode/creport.c | 0 src/{common => src}/gamecode/creport.h | 0 src/{common => src}/gamecode/economy.c | 0 src/{common => src}/gamecode/economy.h | 0 src/{common => src}/gamecode/give.c | 0 src/{common => src}/gamecode/give.h | 0 src/{common => src}/gamecode/items.c | 0 src/{common => src}/gamecode/items.h | 0 src/{common => src}/gamecode/laws.c | 0 src/{common => src}/gamecode/laws.h | 0 src/{common => src}/gamecode/market.c | 0 src/{common => src}/gamecode/market.h | 0 src/{common => src}/gamecode/monster.c | 0 src/{common => src}/gamecode/monster.h | 0 src/{common => src}/gamecode/randenc.c | 0 src/{common => src}/gamecode/randenc.h | 0 src/{common => src}/gamecode/report.c | 0 src/{common => src}/gamecode/report.h | 0 src/{common => src}/gamecode/spy.c | 0 src/{common => src}/gamecode/spy.h | 0 src/{common => src}/gamecode/study.c | 0 src/{common => src}/gamecode/study.h | 0 src/{common => src}/gamecode/summary.c | 0 src/{common => src}/gamecode/summary.h | 0 src/{common => src}/gamecode/xmlreport.c | 0 src/{common => src}/gamecode/xmlreport.h | 0 src/{common => src}/gmtool.c | 0 src/{common => src}/gmtool.h | 0 src/{common => src}/gmtool.vcproj | 18 ++++++++--------- src/{common => src}/gmtool_structs.h | 0 src/{common => src}/items/Jamfile | 0 src/{common => src}/items/artrewards.c | 0 src/{common => src}/items/artrewards.h | 0 src/{common => src}/items/demonseye.c | 0 src/{common => src}/items/demonseye.h | 0 src/{common => src}/items/itemtypes.c | 0 src/{common => src}/items/itemtypes.h | 0 src/{common => src}/items/phoenixcompass.c | 0 src/{common => src}/items/phoenixcompass.h | 0 src/{common => src}/items/seed.c | 0 src/{common => src}/items/seed.h | 0 src/{common => src}/items/speedsail.c | 0 src/{common => src}/items/speedsail.h | 0 src/{common => src}/items/studypotion.c | 0 src/{common => src}/items/studypotion.h | 0 src/{common => src}/items/weapons.c | 0 src/{common => src}/items/weapons.h | 0 src/{common => src}/items/xerewards.c | 0 src/{common => src}/items/xerewards.h | 0 src/{common => src}/kernel.vcproj | 4 ++-- src/{common => src}/kernel/Jamfile | 0 src/{common => src}/kernel/alchemy.c | 0 src/{common => src}/kernel/alchemy.h | 0 src/{common => src}/kernel/alliance.c | 0 src/{common => src}/kernel/alliance.h | 0 src/{common => src}/kernel/battle.c | 0 src/{common => src}/kernel/battle.h | 0 src/{common => src}/kernel/binarystore.c | 0 src/{common => src}/kernel/binarystore.h | 0 src/{common => src}/kernel/build.c | 0 src/{common => src}/kernel/build.h | 0 src/{common => src}/kernel/building.c | 0 src/{common => src}/kernel/building.h | 0 src/{common => src}/kernel/calendar.c | 0 src/{common => src}/kernel/calendar.h | 0 src/{common => src}/kernel/command.c | 0 src/{common => src}/kernel/command.h | 0 src/{common => src}/kernel/config.c | 0 src/{common => src}/kernel/config.h | 0 src/{common => src}/kernel/connection.c | 0 src/{common => src}/kernel/connection.h | 0 src/{common => src}/kernel/curse.c | 0 src/{common => src}/kernel/curse.h | 0 src/{common => src}/kernel/curse_test.c | 2 +- src/{common => src}/kernel/equipment.c | 0 src/{common => src}/kernel/equipment.h | 0 src/{common => src}/kernel/faction.c | 0 src/{common => src}/kernel/faction.h | 0 src/{common => src}/kernel/group.c | 0 src/{common => src}/kernel/group.h | 0 src/{common => src}/kernel/item.c | 1 + src/{common => src}/kernel/item.h | 0 src/{common => src}/kernel/magic.c | 0 src/{common => src}/kernel/magic.h | 0 src/{common => src}/kernel/message.c | 0 src/{common => src}/kernel/message.h | 0 src/{common => src}/kernel/move.c | 0 src/{common => src}/kernel/move.h | 0 src/{common => src}/kernel/names.c | 0 src/{common => src}/kernel/names.h | 0 src/{common => src}/kernel/objtypes.h | 0 src/{common => src}/kernel/order.c | 0 src/{common => src}/kernel/order.h | 0 src/{common => src}/kernel/pathfinder.c | 0 src/{common => src}/kernel/pathfinder.h | 0 src/{common => src}/kernel/plane.c | 0 src/{common => src}/kernel/plane.h | 0 src/{common => src}/kernel/player.c | 0 src/{common => src}/kernel/player.h | 0 src/{common => src}/kernel/pool.c | 0 src/{common => src}/kernel/pool.h | 0 src/{common => src}/kernel/race.c | 0 src/{common => src}/kernel/race.h | 0 src/{common => src}/kernel/region.c | 0 src/{common => src}/kernel/region.h | 0 src/{common => src}/kernel/render.h | 0 src/{common => src}/kernel/reports.c | 0 src/{common => src}/kernel/reports.h | 0 src/{common => src}/kernel/resources.c | 0 src/{common => src}/kernel/resources.h | 0 src/{common => src}/kernel/save.c | 0 src/{common => src}/kernel/save.h | 0 src/{common => src}/kernel/ship.c | 0 src/{common => src}/kernel/ship.h | 0 src/{common => src}/kernel/skill.c | 0 src/{common => src}/kernel/skill.h | 0 src/{common => src}/kernel/spell.c | 0 src/{common => src}/kernel/spell.h | 0 src/{common => src}/kernel/spellid.h | 0 src/{common => src}/kernel/sqlite.c | 0 src/{common => src}/kernel/teleport.c | 0 src/{common => src}/kernel/teleport.h | 0 src/{common => src}/kernel/terrain.c | 0 src/{common => src}/kernel/terrain.h | 0 src/{common => src}/kernel/terrainid.h | 0 src/{common => src}/kernel/textstore.c | 0 src/{common => src}/kernel/textstore.h | 0 src/{common => src}/kernel/types.h | 0 src/{common => src}/kernel/unit.c | 0 src/{common => src}/kernel/unit.h | 0 src/{common => src}/kernel/version.h | 0 src/{common => src}/kernel/xmlkernel.h | 0 src/{common => src}/kernel/xmlreader.c | 0 src/{common => src}/kernel/xmlreader.h | 0 src/{common => src}/lua-bindings.vcproj | 8 ++++---- src/{common => src}/lua.hpp | 0 src/{common => src}/modules/Jamfile | 0 src/{common => src}/modules/arena.c | 0 src/{common => src}/modules/arena.h | 0 src/{common => src}/modules/autoseed.c | 0 src/{common => src}/modules/autoseed.h | 0 src/{common => src}/modules/dungeon.c | 0 src/{common => src}/modules/dungeon.h | 0 src/{common => src}/modules/gmcmd.c | 0 src/{common => src}/modules/gmcmd.h | 0 src/{common => src}/modules/museum.c | 1 + src/{common => src}/modules/museum.h | 0 src/{common => src}/modules/oceannames.c | 0 src/{common => src}/modules/oceannames.h | 0 src/{common => src}/modules/score.c | 0 src/{common => src}/modules/score.h | 0 src/{common => src}/modules/weather.c | 0 src/{common => src}/modules/weather.h | 0 src/{common => src}/modules/wormhole.c | 0 src/{common => src}/modules/wormhole.h | 0 src/{common => src}/modules/xecmd.c | 0 src/{common => src}/modules/xecmd.h | 0 src/{common => src}/modules/xmas.c | 0 src/{common => src}/modules/xmas.h | 0 src/{ => src}/platform.h | 0 src/{common => src}/races/Jamfile | 0 src/{common => src}/races/dragons.c | 0 src/{common => src}/races/dragons.h | 0 src/{common => src}/races/illusion.c | 0 src/{common => src}/races/illusion.h | 0 src/{common => src}/races/races.c | 0 src/{common => src}/races/races.h | 0 src/{common => src}/races/zombies.c | 0 src/{common => src}/races/zombies.h | 0 src/{common => src}/settings.h | 0 src/{common => src}/tests.c | 2 +- src/{common => src}/tests.vcproj | 4 ++-- src/{common => src}/triggers/Jamfile | 0 src/{common => src}/triggers/changefaction.c | 0 src/{common => src}/triggers/changefaction.h | 0 src/{common => src}/triggers/changerace.c | 0 src/{common => src}/triggers/changerace.h | 0 src/{common => src}/triggers/clonedied.c | 0 src/{common => src}/triggers/clonedied.h | 0 src/{common => src}/triggers/createcurse.c | 0 src/{common => src}/triggers/createcurse.h | 0 src/{common => src}/triggers/createunit.c | 0 src/{common => src}/triggers/createunit.h | 0 src/{common => src}/triggers/gate.c | 0 src/{common => src}/triggers/gate.h | 0 src/{common => src}/triggers/giveitem.c | 0 src/{common => src}/triggers/giveitem.h | 0 src/{common => src}/triggers/killunit.c | 0 src/{common => src}/triggers/killunit.h | 0 src/{common => src}/triggers/removecurse.c | 0 src/{common => src}/triggers/removecurse.h | 0 src/{common => src}/triggers/shock.c | 0 src/{common => src}/triggers/shock.h | 0 src/{common => src}/triggers/timeout.c | 0 src/{common => src}/triggers/timeout.h | 0 src/{common => src}/triggers/triggers.c | 0 src/{common => src}/triggers/triggers.h | 0 src/{common => src}/triggers/unguard.c | 0 src/{common => src}/triggers/unguard.h | 0 src/{common => src}/triggers/unitmessage.c | 0 src/{common => src}/triggers/unitmessage.h | 0 src/{common => src}/util.vcproj | 4 ++-- src/{common => src}/util/Jamfile | 0 src/{common => src}/util/argstack.c | 0 src/{common => src}/util/argstack.h | 0 src/{common => src}/util/attrib.c | 0 src/{common => src}/util/attrib.h | 0 src/{common => src}/util/base36.c | 0 src/{common => src}/util/base36.h | 0 src/{common => src}/util/base36_test.c | 2 +- src/{common => src}/util/bsdstring.c | 0 src/{common => src}/util/bsdstring.h | 0 src/{common => src}/util/console.c | 0 src/{common => src}/util/console.h | 0 src/{common => src}/util/crmessage.c | 0 src/{common => src}/util/crmessage.h | 0 src/{common => src}/util/cvector.c | 0 src/{common => src}/util/cvector.h | 0 src/{common => src}/util/dice.c | 0 src/{common => src}/util/event.c | 0 src/{common => src}/util/event.h | 0 src/{common => src}/util/eventbus.c | 0 src/{common => src}/util/eventbus.h | 0 src/{common => src}/util/filereader.c | 0 src/{common => src}/util/filereader.h | 0 src/{common => src}/util/functions.c | 0 src/{common => src}/util/functions.h | 0 src/{common => src}/util/goodies.c | 0 src/{common => src}/util/goodies.h | 0 src/{common => src}/util/graph.c | 0 src/{common => src}/util/graph.h | 0 src/{common => src}/util/language.c | 0 src/{common => src}/util/language.h | 0 src/{common => src}/util/language_struct.h | 0 src/{common => src}/util/listbox.c | 0 src/{common => src}/util/listbox.h | 0 src/{common => src}/util/lists.c | 0 src/{common => src}/util/lists.h | 0 src/{common => src}/util/log.c | 0 src/{common => src}/util/log.h | 0 src/{common => src}/util/message.c | 0 src/{common => src}/util/message.h | 0 src/{common => src}/util/nrmessage.c | 0 src/{common => src}/util/nrmessage.h | 0 src/{common => src}/util/nrmessage_struct.h | 0 src/{common => src}/util/parser.c | 0 src/{common => src}/util/parser.h | 0 src/{common => src}/util/patricia.c | 0 src/{common => src}/util/patricia.h | 0 src/{common => src}/util/rand.c | 0 src/{common => src}/util/rand.h | 0 src/{common => src}/util/resolve.c | 0 src/{common => src}/util/resolve.h | 0 src/{common => src}/util/rng.h | 0 src/{common => src}/util/sql.c | 0 src/{common => src}/util/sql.h | 0 src/{common => src}/util/storage.h | 0 src/{common => src}/util/strings.c | 0 src/{common => src}/util/strncpy.c | 0 src/{common => src}/util/translation.c | 0 src/{common => src}/util/translation.h | 0 src/{common => src}/util/umlaut.c | 0 src/{common => src}/util/umlaut.h | 0 src/{common => src}/util/unicode.c | 0 src/{common => src}/util/unicode.h | 0 src/{common => src}/util/variant.h | 0 src/{common => src}/util/vmap.c | 0 src/{common => src}/util/vmap.h | 0 src/{common => src}/util/vset.c | 0 src/{common => src}/util/vset.h | 0 src/{common => src}/util/windir.c | 0 src/{common => src}/util/windir.h | 0 src/{common => src}/util/xml.c | 0 src/{common => src}/util/xml.h | 0 371 files changed, 102 insertions(+), 82 deletions(-) delete mode 100644 src/common/build/external.c delete mode 100644 src/common/build/stdafx.h rename src/{common => src}/Jamfile (100%) rename src/{common => src}/attributes/Jamfile (100%) rename src/{common => src}/attributes/aggressive.h (100%) rename src/{common => src}/attributes/alliance.c (100%) rename src/{common => src}/attributes/alliance.h (100%) rename src/{common => src}/attributes/attributes.c (100%) rename src/{common => src}/attributes/attributes.h (100%) rename src/{common => src}/attributes/fleechance.c (100%) rename src/{common => src}/attributes/fleechance.h (100%) rename src/{common => src}/attributes/follow.c (100%) rename src/{common => src}/attributes/follow.h (100%) rename src/{common => src}/attributes/giveitem.c (100%) rename src/{common => src}/attributes/giveitem.h (100%) rename src/{common => src}/attributes/gm.c (100%) rename src/{common => src}/attributes/gm.h (100%) rename src/{common => src}/attributes/hate.c (100%) rename src/{common => src}/attributes/hate.h (100%) rename src/{common => src}/attributes/iceberg.c (100%) rename src/{common => src}/attributes/iceberg.h (100%) rename src/{common => src}/attributes/key.c (100%) rename src/{common => src}/attributes/key.h (100%) rename src/{common => src}/attributes/matmod.c (100%) rename src/{common => src}/attributes/matmod.h (100%) rename src/{common => src}/attributes/moved.c (100%) rename src/{common => src}/attributes/moved.h (100%) rename src/{common => src}/attributes/movement.c (100%) rename src/{common => src}/attributes/movement.h (100%) rename src/{common => src}/attributes/object.c (100%) rename src/{common => src}/attributes/object.h (100%) rename src/{common => src}/attributes/orcification.c (100%) rename src/{common => src}/attributes/orcification.h (100%) rename src/{common => src}/attributes/otherfaction.c (100%) rename src/{common => src}/attributes/otherfaction.h (100%) rename src/{common => src}/attributes/overrideroads.c (100%) rename src/{common => src}/attributes/overrideroads.h (100%) rename src/{common => src}/attributes/racename.c (100%) rename src/{common => src}/attributes/racename.h (100%) rename src/{common => src}/attributes/raceprefix.c (100%) rename src/{common => src}/attributes/raceprefix.h (100%) rename src/{common => src}/attributes/reduceproduction.c (100%) rename src/{common => src}/attributes/reduceproduction.h (100%) rename src/{common => src}/attributes/targetregion.c (100%) rename src/{common => src}/attributes/targetregion.h (100%) rename src/{common => src}/attributes/viewrange.c (100%) rename src/{common => src}/attributes/viewrange.h (100%) rename src/{common => src}/bindings/bind_attrib.c (100%) rename src/{common => src}/bindings/bind_attrib.h (100%) rename src/{common => src}/bindings/bind_building.c (100%) rename src/{common => src}/bindings/bind_building.h (100%) rename src/{common => src}/bindings/bind_faction.c (100%) rename src/{common => src}/bindings/bind_faction.h (100%) rename src/{common => src}/bindings/bind_gmtool.c (100%) rename src/{common => src}/bindings/bind_gmtool.h (100%) rename src/{common => src}/bindings/bind_hashtable.c (100%) rename src/{common => src}/bindings/bind_hashtable.h (100%) rename src/{common => src}/bindings/bind_message.c (100%) rename src/{common => src}/bindings/bind_message.h (100%) rename src/{common => src}/bindings/bind_region.c (100%) rename src/{common => src}/bindings/bind_region.h (100%) rename src/{common => src}/bindings/bind_ship.c (100%) rename src/{common => src}/bindings/bind_ship.h (100%) rename src/{common => src}/bindings/bind_sqlite.c (100%) rename src/{common => src}/bindings/bind_storage.c (100%) rename src/{common => src}/bindings/bind_storage.h (100%) rename src/{common => src}/bindings/bind_unit.c (100%) rename src/{common => src}/bindings/bind_unit.h (100%) rename src/{common => src}/bindings/bindings.c (100%) rename src/{common => src}/bindings/bindings.h (100%) rename src/{common => src}/bindings/helpers.c (99%) rename src/{common => src}/bindings/helpers.h (100%) rename src/{common => src}/build/Copy of curses.c (100%) rename src/{common => src}/build/Jamfile (100%) rename src/{common => src}/build/atoi36.c (100%) create mode 100644 src/src/build/external.c rename src/{common => src}/build/gamecode.c (100%) rename src/{common => src}/build/kernel.c (100%) rename src/{common => src}/build/lib.c (79%) rename src/{common => src}/build/malloc.c (100%) rename src/{common => src}/build/stdafx.c (100%) create mode 100644 src/src/build/stdafx.h rename src/{common => src}/build/util.c (91%) rename src/{common => src}/eressea.c (100%) rename src/{common => src}/eressea.h (100%) rename src/{common => src}/gamecode.vcproj (98%) rename src/{common => src}/gamecode/Jamfile (100%) rename src/{common => src}/gamecode/archetype.c (100%) rename src/{common => src}/gamecode/archetype.h (100%) rename src/{common => src}/gamecode/creation.c (100%) rename src/{common => src}/gamecode/creation.h (100%) rename src/{common => src}/gamecode/creport.c (100%) rename src/{common => src}/gamecode/creport.h (100%) rename src/{common => src}/gamecode/economy.c (100%) rename src/{common => src}/gamecode/economy.h (100%) rename src/{common => src}/gamecode/give.c (100%) rename src/{common => src}/gamecode/give.h (100%) rename src/{common => src}/gamecode/items.c (100%) rename src/{common => src}/gamecode/items.h (100%) rename src/{common => src}/gamecode/laws.c (100%) rename src/{common => src}/gamecode/laws.h (100%) rename src/{common => src}/gamecode/market.c (100%) rename src/{common => src}/gamecode/market.h (100%) rename src/{common => src}/gamecode/monster.c (100%) rename src/{common => src}/gamecode/monster.h (100%) rename src/{common => src}/gamecode/randenc.c (100%) rename src/{common => src}/gamecode/randenc.h (100%) rename src/{common => src}/gamecode/report.c (100%) rename src/{common => src}/gamecode/report.h (100%) rename src/{common => src}/gamecode/spy.c (100%) rename src/{common => src}/gamecode/spy.h (100%) rename src/{common => src}/gamecode/study.c (100%) rename src/{common => src}/gamecode/study.h (100%) rename src/{common => src}/gamecode/summary.c (100%) rename src/{common => src}/gamecode/summary.h (100%) rename src/{common => src}/gamecode/xmlreport.c (100%) rename src/{common => src}/gamecode/xmlreport.h (100%) rename src/{common => src}/gmtool.c (100%) rename src/{common => src}/gmtool.h (100%) rename src/{common => src}/gmtool.vcproj (86%) rename src/{common => src}/gmtool_structs.h (100%) rename src/{common => src}/items/Jamfile (100%) rename src/{common => src}/items/artrewards.c (100%) rename src/{common => src}/items/artrewards.h (100%) rename src/{common => src}/items/demonseye.c (100%) rename src/{common => src}/items/demonseye.h (100%) rename src/{common => src}/items/itemtypes.c (100%) rename src/{common => src}/items/itemtypes.h (100%) rename src/{common => src}/items/phoenixcompass.c (100%) rename src/{common => src}/items/phoenixcompass.h (100%) rename src/{common => src}/items/seed.c (100%) rename src/{common => src}/items/seed.h (100%) rename src/{common => src}/items/speedsail.c (100%) rename src/{common => src}/items/speedsail.h (100%) rename src/{common => src}/items/studypotion.c (100%) rename src/{common => src}/items/studypotion.h (100%) rename src/{common => src}/items/weapons.c (100%) rename src/{common => src}/items/weapons.h (100%) rename src/{common => src}/items/xerewards.c (100%) rename src/{common => src}/items/xerewards.h (100%) rename src/{common => src}/kernel.vcproj (99%) rename src/{common => src}/kernel/Jamfile (100%) rename src/{common => src}/kernel/alchemy.c (100%) rename src/{common => src}/kernel/alchemy.h (100%) rename src/{common => src}/kernel/alliance.c (100%) rename src/{common => src}/kernel/alliance.h (100%) rename src/{common => src}/kernel/battle.c (100%) rename src/{common => src}/kernel/battle.h (100%) rename src/{common => src}/kernel/binarystore.c (100%) rename src/{common => src}/kernel/binarystore.h (100%) rename src/{common => src}/kernel/build.c (100%) rename src/{common => src}/kernel/build.h (100%) rename src/{common => src}/kernel/building.c (100%) rename src/{common => src}/kernel/building.h (100%) rename src/{common => src}/kernel/calendar.c (100%) rename src/{common => src}/kernel/calendar.h (100%) rename src/{common => src}/kernel/command.c (100%) rename src/{common => src}/kernel/command.h (100%) rename src/{common => src}/kernel/config.c (100%) rename src/{common => src}/kernel/config.h (100%) rename src/{common => src}/kernel/connection.c (100%) rename src/{common => src}/kernel/connection.h (100%) rename src/{common => src}/kernel/curse.c (100%) rename src/{common => src}/kernel/curse.h (100%) rename src/{common => src}/kernel/curse_test.c (94%) rename src/{common => src}/kernel/equipment.c (100%) rename src/{common => src}/kernel/equipment.h (100%) rename src/{common => src}/kernel/faction.c (100%) rename src/{common => src}/kernel/faction.h (100%) rename src/{common => src}/kernel/group.c (100%) rename src/{common => src}/kernel/group.h (100%) rename src/{common => src}/kernel/item.c (99%) rename src/{common => src}/kernel/item.h (100%) rename src/{common => src}/kernel/magic.c (100%) rename src/{common => src}/kernel/magic.h (100%) rename src/{common => src}/kernel/message.c (100%) rename src/{common => src}/kernel/message.h (100%) rename src/{common => src}/kernel/move.c (100%) rename src/{common => src}/kernel/move.h (100%) rename src/{common => src}/kernel/names.c (100%) rename src/{common => src}/kernel/names.h (100%) rename src/{common => src}/kernel/objtypes.h (100%) rename src/{common => src}/kernel/order.c (100%) rename src/{common => src}/kernel/order.h (100%) rename src/{common => src}/kernel/pathfinder.c (100%) rename src/{common => src}/kernel/pathfinder.h (100%) rename src/{common => src}/kernel/plane.c (100%) rename src/{common => src}/kernel/plane.h (100%) rename src/{common => src}/kernel/player.c (100%) rename src/{common => src}/kernel/player.h (100%) rename src/{common => src}/kernel/pool.c (100%) rename src/{common => src}/kernel/pool.h (100%) rename src/{common => src}/kernel/race.c (100%) rename src/{common => src}/kernel/race.h (100%) rename src/{common => src}/kernel/region.c (100%) rename src/{common => src}/kernel/region.h (100%) rename src/{common => src}/kernel/render.h (100%) rename src/{common => src}/kernel/reports.c (100%) rename src/{common => src}/kernel/reports.h (100%) rename src/{common => src}/kernel/resources.c (100%) rename src/{common => src}/kernel/resources.h (100%) rename src/{common => src}/kernel/save.c (100%) rename src/{common => src}/kernel/save.h (100%) rename src/{common => src}/kernel/ship.c (100%) rename src/{common => src}/kernel/ship.h (100%) rename src/{common => src}/kernel/skill.c (100%) rename src/{common => src}/kernel/skill.h (100%) rename src/{common => src}/kernel/spell.c (100%) rename src/{common => src}/kernel/spell.h (100%) rename src/{common => src}/kernel/spellid.h (100%) rename src/{common => src}/kernel/sqlite.c (100%) rename src/{common => src}/kernel/teleport.c (100%) rename src/{common => src}/kernel/teleport.h (100%) rename src/{common => src}/kernel/terrain.c (100%) rename src/{common => src}/kernel/terrain.h (100%) rename src/{common => src}/kernel/terrainid.h (100%) rename src/{common => src}/kernel/textstore.c (100%) rename src/{common => src}/kernel/textstore.h (100%) rename src/{common => src}/kernel/types.h (100%) rename src/{common => src}/kernel/unit.c (100%) rename src/{common => src}/kernel/unit.h (100%) rename src/{common => src}/kernel/version.h (100%) rename src/{common => src}/kernel/xmlkernel.h (100%) rename src/{common => src}/kernel/xmlreader.c (100%) rename src/{common => src}/kernel/xmlreader.h (100%) rename src/{common => src}/lua-bindings.vcproj (95%) rename src/{common => src}/lua.hpp (100%) rename src/{common => src}/modules/Jamfile (100%) rename src/{common => src}/modules/arena.c (100%) rename src/{common => src}/modules/arena.h (100%) rename src/{common => src}/modules/autoseed.c (100%) rename src/{common => src}/modules/autoseed.h (100%) rename src/{common => src}/modules/dungeon.c (100%) rename src/{common => src}/modules/dungeon.h (100%) rename src/{common => src}/modules/gmcmd.c (100%) rename src/{common => src}/modules/gmcmd.h (100%) rename src/{common => src}/modules/museum.c (99%) rename src/{common => src}/modules/museum.h (100%) rename src/{common => src}/modules/oceannames.c (100%) rename src/{common => src}/modules/oceannames.h (100%) rename src/{common => src}/modules/score.c (100%) rename src/{common => src}/modules/score.h (100%) rename src/{common => src}/modules/weather.c (100%) rename src/{common => src}/modules/weather.h (100%) rename src/{common => src}/modules/wormhole.c (100%) rename src/{common => src}/modules/wormhole.h (100%) rename src/{common => src}/modules/xecmd.c (100%) rename src/{common => src}/modules/xecmd.h (100%) rename src/{common => src}/modules/xmas.c (100%) rename src/{common => src}/modules/xmas.h (100%) rename src/{ => src}/platform.h (100%) rename src/{common => src}/races/Jamfile (100%) rename src/{common => src}/races/dragons.c (100%) rename src/{common => src}/races/dragons.h (100%) rename src/{common => src}/races/illusion.c (100%) rename src/{common => src}/races/illusion.h (100%) rename src/{common => src}/races/races.c (100%) rename src/{common => src}/races/races.h (100%) rename src/{common => src}/races/zombies.c (100%) rename src/{common => src}/races/zombies.h (100%) rename src/{common => src}/settings.h (100%) rename src/{common => src}/tests.c (92%) rename src/{common => src}/tests.vcproj (97%) rename src/{common => src}/triggers/Jamfile (100%) rename src/{common => src}/triggers/changefaction.c (100%) rename src/{common => src}/triggers/changefaction.h (100%) rename src/{common => src}/triggers/changerace.c (100%) rename src/{common => src}/triggers/changerace.h (100%) rename src/{common => src}/triggers/clonedied.c (100%) rename src/{common => src}/triggers/clonedied.h (100%) rename src/{common => src}/triggers/createcurse.c (100%) rename src/{common => src}/triggers/createcurse.h (100%) rename src/{common => src}/triggers/createunit.c (100%) rename src/{common => src}/triggers/createunit.h (100%) rename src/{common => src}/triggers/gate.c (100%) rename src/{common => src}/triggers/gate.h (100%) rename src/{common => src}/triggers/giveitem.c (100%) rename src/{common => src}/triggers/giveitem.h (100%) rename src/{common => src}/triggers/killunit.c (100%) rename src/{common => src}/triggers/killunit.h (100%) rename src/{common => src}/triggers/removecurse.c (100%) rename src/{common => src}/triggers/removecurse.h (100%) rename src/{common => src}/triggers/shock.c (100%) rename src/{common => src}/triggers/shock.h (100%) rename src/{common => src}/triggers/timeout.c (100%) rename src/{common => src}/triggers/timeout.h (100%) rename src/{common => src}/triggers/triggers.c (100%) rename src/{common => src}/triggers/triggers.h (100%) rename src/{common => src}/triggers/unguard.c (100%) rename src/{common => src}/triggers/unguard.h (100%) rename src/{common => src}/triggers/unitmessage.c (100%) rename src/{common => src}/triggers/unitmessage.h (100%) rename src/{common => src}/util.vcproj (98%) rename src/{common => src}/util/Jamfile (100%) rename src/{common => src}/util/argstack.c (100%) rename src/{common => src}/util/argstack.h (100%) rename src/{common => src}/util/attrib.c (100%) rename src/{common => src}/util/attrib.h (100%) rename src/{common => src}/util/base36.c (100%) rename src/{common => src}/util/base36.h (100%) rename src/{common => src}/util/base36_test.c (95%) rename src/{common => src}/util/bsdstring.c (100%) rename src/{common => src}/util/bsdstring.h (100%) rename src/{common => src}/util/console.c (100%) rename src/{common => src}/util/console.h (100%) rename src/{common => src}/util/crmessage.c (100%) rename src/{common => src}/util/crmessage.h (100%) rename src/{common => src}/util/cvector.c (100%) rename src/{common => src}/util/cvector.h (100%) rename src/{common => src}/util/dice.c (100%) rename src/{common => src}/util/event.c (100%) rename src/{common => src}/util/event.h (100%) rename src/{common => src}/util/eventbus.c (100%) rename src/{common => src}/util/eventbus.h (100%) rename src/{common => src}/util/filereader.c (100%) rename src/{common => src}/util/filereader.h (100%) rename src/{common => src}/util/functions.c (100%) rename src/{common => src}/util/functions.h (100%) rename src/{common => src}/util/goodies.c (100%) rename src/{common => src}/util/goodies.h (100%) rename src/{common => src}/util/graph.c (100%) rename src/{common => src}/util/graph.h (100%) rename src/{common => src}/util/language.c (100%) rename src/{common => src}/util/language.h (100%) rename src/{common => src}/util/language_struct.h (100%) rename src/{common => src}/util/listbox.c (100%) rename src/{common => src}/util/listbox.h (100%) rename src/{common => src}/util/lists.c (100%) rename src/{common => src}/util/lists.h (100%) rename src/{common => src}/util/log.c (100%) rename src/{common => src}/util/log.h (100%) rename src/{common => src}/util/message.c (100%) rename src/{common => src}/util/message.h (100%) rename src/{common => src}/util/nrmessage.c (100%) rename src/{common => src}/util/nrmessage.h (100%) rename src/{common => src}/util/nrmessage_struct.h (100%) rename src/{common => src}/util/parser.c (100%) rename src/{common => src}/util/parser.h (100%) rename src/{common => src}/util/patricia.c (100%) rename src/{common => src}/util/patricia.h (100%) rename src/{common => src}/util/rand.c (100%) rename src/{common => src}/util/rand.h (100%) rename src/{common => src}/util/resolve.c (100%) rename src/{common => src}/util/resolve.h (100%) rename src/{common => src}/util/rng.h (100%) rename src/{common => src}/util/sql.c (100%) rename src/{common => src}/util/sql.h (100%) rename src/{common => src}/util/storage.h (100%) rename src/{common => src}/util/strings.c (100%) rename src/{common => src}/util/strncpy.c (100%) rename src/{common => src}/util/translation.c (100%) rename src/{common => src}/util/translation.h (100%) rename src/{common => src}/util/umlaut.c (100%) rename src/{common => src}/util/umlaut.h (100%) rename src/{common => src}/util/unicode.c (100%) rename src/{common => src}/util/unicode.h (100%) rename src/{common => src}/util/variant.h (100%) rename src/{common => src}/util/vmap.c (100%) rename src/{common => src}/util/vmap.h (100%) rename src/{common => src}/util/vset.c (100%) rename src/{common => src}/util/vset.h (100%) rename src/{common => src}/util/windir.c (100%) rename src/{common => src}/util/windir.h (100%) rename src/{common => src}/util/xml.c (100%) rename src/{common => src}/util/xml.h (100%) diff --git a/src/all.sln b/src/all.sln index ef3ea5f21..03590f1a4 100644 --- a/src/all.sln +++ b/src/all.sln @@ -1,12 +1,12 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "common\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "src\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "common\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "src\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "common\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "src\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "common\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "src\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 @@ -14,7 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-eressea", "ere EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-basic", "basic\basic.vcproj", "{4A17DAEE-2261-4E2C-96F6-BA4132A09551}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "common\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "src\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}" EndProject Global GlobalSection(SubversionScc) = preSolution diff --git a/src/basic/basic.sln b/src/basic/basic.sln index f49acd200..47c0dff4f 100644 --- a/src/basic/basic.sln +++ b/src/basic/basic.sln @@ -1,16 +1,18 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\common\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\src\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\common\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\src\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\common\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\src\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\common\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\src\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", "basic.vcproj", "{4A17DAEE-2261-4E2C-96F6-BA4132A09551}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-basic", "basic.vcproj", "{4A17DAEE-2261-4E2C-96F6-BA4132A09551}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "..\src\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}" EndProject Global GlobalSection(SubversionScc) = preSolution @@ -40,6 +42,10 @@ Global {4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Debug|Win32.ActiveCfg = Debug|Win32 {4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Debug|Win32.Build.0 = Debug|Win32 {4A17DAEE-2261-4E2C-96F6-BA4132A09551}.Release|Win32.ActiveCfg = Release|Win32 + {228B8781-480F-4608-BA14-1EB82581EADE}.Debug|Win32.ActiveCfg = Debug|Win32 + {228B8781-480F-4608-BA14-1EB82581EADE}.Debug|Win32.Build.0 = Debug|Win32 + {228B8781-480F-4608-BA14-1EB82581EADE}.Release|Win32.ActiveCfg = Release|Win32 + {228B8781-480F-4608-BA14-1EB82581EADE}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/basic/basic.vcproj b/src/basic/basic.vcproj index 3e32ed951..a549145cd 100644 --- a/src/basic/basic.vcproj +++ b/src/basic/basic.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..;../common;../external" + AdditionalIncludeDirectories="../src;../external" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -124,7 +124,7 @@ /> @@ -221,19 +221,19 @@ Name="Unity Build" > diff --git a/src/common/build/external.c b/src/common/build/external.c deleted file mode 100644 index 720a37494..000000000 --- a/src/common/build/external.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common/settings.h" -#include -#include "stdafx.h" - -#pragma warning(push) -#pragma warning(disable: 4244) -#pragma warning(disable: 4127) -#include -#pragma warning(pop) -#include -#include -#include diff --git a/src/common/build/stdafx.h b/src/common/build/stdafx.h deleted file mode 100644 index 27a78105e..000000000 --- a/src/common/build/stdafx.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "common/settings.h" -#include diff --git a/src/eressea/eressea.sln b/src/eressea/eressea.sln index d18933bd6..0a82cded6 100644 --- a/src/eressea/eressea.sln +++ b/src/eressea/eressea.sln @@ -1,16 +1,18 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\common\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kernel", "..\src\kernel.vcproj", "{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\common\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamecode", "..\src\gamecode.vcproj", "{1E8BFF9E-3044-0742-992F-C5765B80FE65}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\common\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "..\src\util.vcproj", "{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\common\lua-bindings.vcproj", "{75501170-51C2-E641-BA8B-EDC008184192}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-bindings", "..\src\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.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amalgamation-eressea", "eressea.vcproj", "{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "..\src\tests.vcproj", "{228B8781-480F-4608-BA14-1EB82581EADE}" EndProject Global GlobalSection(SubversionScc) = preSolution @@ -28,9 +30,6 @@ Global {1E8BFF9E-3044-0742-992F-C5765B80FE65}.Debug|Win32.ActiveCfg = Debug|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}.Release|Win32.ActiveCfg = Release|Win32 - {D893D6B3-805D-9848-8EA4-CDA1B79151F6}.Release|Win32.Build.0 = Release|Win32 {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Debug|Win32.ActiveCfg = Debug|Win32 {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.ActiveCfg = Release|Win32 {F70CFB27-8A2F-E447-B452-4E1C590EDA6D}.Release|Win32.Build.0 = Release|Win32 @@ -43,6 +42,10 @@ Global {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 + {228B8781-480F-4608-BA14-1EB82581EADE}.Debug|Win32.ActiveCfg = Debug|Win32 + {228B8781-480F-4608-BA14-1EB82581EADE}.Debug|Win32.Build.0 = Debug|Win32 + {228B8781-480F-4608-BA14-1EB82581EADE}.Release|Win32.ActiveCfg = Release|Win32 + {228B8781-480F-4608-BA14-1EB82581EADE}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/eressea/eressea.vcproj b/src/eressea/eressea.vcproj index f4225ee24..c1d4095ab 100644 --- a/src/eressea/eressea.vcproj +++ b/src/eressea/eressea.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..;../common;../external" + AdditionalIncludeDirectories="../src;../external" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -124,7 +124,7 @@ /> diff --git a/src/external/external.vcproj b/src/external/external.vcproj index b13d25bb4..e1d665ee0 100644 --- a/src/external/external.vcproj +++ b/src/external/external.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..;../common;../external" + AdditionalIncludeDirectories=".;../src" PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -109,7 +109,7 @@ + + + +#include +#include #include #include -#include #include #include diff --git a/src/common/bindings/helpers.h b/src/src/bindings/helpers.h similarity index 100% rename from src/common/bindings/helpers.h rename to src/src/bindings/helpers.h diff --git a/src/common/build/Copy of curses.c b/src/src/build/Copy of curses.c similarity index 100% rename from src/common/build/Copy of curses.c rename to src/src/build/Copy of curses.c diff --git a/src/common/build/Jamfile b/src/src/build/Jamfile similarity index 100% rename from src/common/build/Jamfile rename to src/src/build/Jamfile diff --git a/src/common/build/atoi36.c b/src/src/build/atoi36.c similarity index 100% rename from src/common/build/atoi36.c rename to src/src/build/atoi36.c diff --git a/src/src/build/external.c b/src/src/build/external.c new file mode 100644 index 000000000..0081b5177 --- /dev/null +++ b/src/src/build/external.c @@ -0,0 +1,12 @@ +#include +#include +#include "stdafx.h" + +#pragma warning(push) +#pragma warning(disable: 4244) +#pragma warning(disable: 4127) +#include +#pragma warning(pop) +#include +#include +#include diff --git a/src/common/build/gamecode.c b/src/src/build/gamecode.c similarity index 100% rename from src/common/build/gamecode.c rename to src/src/build/gamecode.c diff --git a/src/common/build/kernel.c b/src/src/build/kernel.c similarity index 100% rename from src/common/build/kernel.c rename to src/src/build/kernel.c diff --git a/src/common/build/lib.c b/src/src/build/lib.c similarity index 79% rename from src/common/build/lib.c rename to src/src/build/lib.c index 24a6fec70..18624376a 100644 --- a/src/common/build/lib.c +++ b/src/src/build/lib.c @@ -1,4 +1,4 @@ -#include "common/settings.h" +#include #include #include "stdafx.h" diff --git a/src/common/build/malloc.c b/src/src/build/malloc.c similarity index 100% rename from src/common/build/malloc.c rename to src/src/build/malloc.c diff --git a/src/common/build/stdafx.c b/src/src/build/stdafx.c similarity index 100% rename from src/common/build/stdafx.c rename to src/src/build/stdafx.c diff --git a/src/src/build/stdafx.h b/src/src/build/stdafx.h new file mode 100644 index 000000000..b0d94063d --- /dev/null +++ b/src/src/build/stdafx.h @@ -0,0 +1,2 @@ +#include +#include diff --git a/src/common/build/util.c b/src/src/build/util.c similarity index 91% rename from src/common/build/util.c rename to src/src/build/util.c index ca2413114..dfae8d012 100644 --- a/src/common/build/util.c +++ b/src/src/build/util.c @@ -2,8 +2,8 @@ #include #include "stdafx.h" -#include -#include +#include +#include #include #include diff --git a/src/common/eressea.c b/src/src/eressea.c similarity index 100% rename from src/common/eressea.c rename to src/src/eressea.c diff --git a/src/common/eressea.h b/src/src/eressea.h similarity index 100% rename from src/common/eressea.h rename to src/src/eressea.h diff --git a/src/common/gamecode.vcproj b/src/src/gamecode.vcproj similarity index 98% rename from src/common/gamecode.vcproj rename to src/src/gamecode.vcproj index 33f6bf7ca..a4e73a495 100644 --- a/src/common/gamecode.vcproj +++ b/src/src/gamecode.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..;." + AdditionalIncludeDirectories="." PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -109,7 +109,7 @@ -#include +#include #include #include "curse.h" diff --git a/src/common/kernel/equipment.c b/src/src/kernel/equipment.c similarity index 100% rename from src/common/kernel/equipment.c rename to src/src/kernel/equipment.c diff --git a/src/common/kernel/equipment.h b/src/src/kernel/equipment.h similarity index 100% rename from src/common/kernel/equipment.h rename to src/src/kernel/equipment.h diff --git a/src/common/kernel/faction.c b/src/src/kernel/faction.c similarity index 100% rename from src/common/kernel/faction.c rename to src/src/kernel/faction.c diff --git a/src/common/kernel/faction.h b/src/src/kernel/faction.h similarity index 100% rename from src/common/kernel/faction.h rename to src/src/kernel/faction.h diff --git a/src/common/kernel/group.c b/src/src/kernel/group.c similarity index 100% rename from src/common/kernel/group.c rename to src/src/kernel/group.c diff --git a/src/common/kernel/group.h b/src/src/kernel/group.h similarity index 100% rename from src/common/kernel/group.h rename to src/src/kernel/group.h diff --git a/src/common/kernel/item.c b/src/src/kernel/item.c similarity index 99% rename from src/common/kernel/item.c rename to src/src/kernel/item.c index fd9241932..295967e97 100644 --- a/src/common/kernel/item.c +++ b/src/src/kernel/item.c @@ -36,6 +36,7 @@ /* util includes */ #include +#include #include #include #include diff --git a/src/common/kernel/item.h b/src/src/kernel/item.h similarity index 100% rename from src/common/kernel/item.h rename to src/src/kernel/item.h diff --git a/src/common/kernel/magic.c b/src/src/kernel/magic.c similarity index 100% rename from src/common/kernel/magic.c rename to src/src/kernel/magic.c diff --git a/src/common/kernel/magic.h b/src/src/kernel/magic.h similarity index 100% rename from src/common/kernel/magic.h rename to src/src/kernel/magic.h diff --git a/src/common/kernel/message.c b/src/src/kernel/message.c similarity index 100% rename from src/common/kernel/message.c rename to src/src/kernel/message.c diff --git a/src/common/kernel/message.h b/src/src/kernel/message.h similarity index 100% rename from src/common/kernel/message.h rename to src/src/kernel/message.h diff --git a/src/common/kernel/move.c b/src/src/kernel/move.c similarity index 100% rename from src/common/kernel/move.c rename to src/src/kernel/move.c diff --git a/src/common/kernel/move.h b/src/src/kernel/move.h similarity index 100% rename from src/common/kernel/move.h rename to src/src/kernel/move.h diff --git a/src/common/kernel/names.c b/src/src/kernel/names.c similarity index 100% rename from src/common/kernel/names.c rename to src/src/kernel/names.c diff --git a/src/common/kernel/names.h b/src/src/kernel/names.h similarity index 100% rename from src/common/kernel/names.h rename to src/src/kernel/names.h diff --git a/src/common/kernel/objtypes.h b/src/src/kernel/objtypes.h similarity index 100% rename from src/common/kernel/objtypes.h rename to src/src/kernel/objtypes.h diff --git a/src/common/kernel/order.c b/src/src/kernel/order.c similarity index 100% rename from src/common/kernel/order.c rename to src/src/kernel/order.c diff --git a/src/common/kernel/order.h b/src/src/kernel/order.h similarity index 100% rename from src/common/kernel/order.h rename to src/src/kernel/order.h diff --git a/src/common/kernel/pathfinder.c b/src/src/kernel/pathfinder.c similarity index 100% rename from src/common/kernel/pathfinder.c rename to src/src/kernel/pathfinder.c diff --git a/src/common/kernel/pathfinder.h b/src/src/kernel/pathfinder.h similarity index 100% rename from src/common/kernel/pathfinder.h rename to src/src/kernel/pathfinder.h diff --git a/src/common/kernel/plane.c b/src/src/kernel/plane.c similarity index 100% rename from src/common/kernel/plane.c rename to src/src/kernel/plane.c diff --git a/src/common/kernel/plane.h b/src/src/kernel/plane.h similarity index 100% rename from src/common/kernel/plane.h rename to src/src/kernel/plane.h diff --git a/src/common/kernel/player.c b/src/src/kernel/player.c similarity index 100% rename from src/common/kernel/player.c rename to src/src/kernel/player.c diff --git a/src/common/kernel/player.h b/src/src/kernel/player.h similarity index 100% rename from src/common/kernel/player.h rename to src/src/kernel/player.h diff --git a/src/common/kernel/pool.c b/src/src/kernel/pool.c similarity index 100% rename from src/common/kernel/pool.c rename to src/src/kernel/pool.c diff --git a/src/common/kernel/pool.h b/src/src/kernel/pool.h similarity index 100% rename from src/common/kernel/pool.h rename to src/src/kernel/pool.h diff --git a/src/common/kernel/race.c b/src/src/kernel/race.c similarity index 100% rename from src/common/kernel/race.c rename to src/src/kernel/race.c diff --git a/src/common/kernel/race.h b/src/src/kernel/race.h similarity index 100% rename from src/common/kernel/race.h rename to src/src/kernel/race.h diff --git a/src/common/kernel/region.c b/src/src/kernel/region.c similarity index 100% rename from src/common/kernel/region.c rename to src/src/kernel/region.c diff --git a/src/common/kernel/region.h b/src/src/kernel/region.h similarity index 100% rename from src/common/kernel/region.h rename to src/src/kernel/region.h diff --git a/src/common/kernel/render.h b/src/src/kernel/render.h similarity index 100% rename from src/common/kernel/render.h rename to src/src/kernel/render.h diff --git a/src/common/kernel/reports.c b/src/src/kernel/reports.c similarity index 100% rename from src/common/kernel/reports.c rename to src/src/kernel/reports.c diff --git a/src/common/kernel/reports.h b/src/src/kernel/reports.h similarity index 100% rename from src/common/kernel/reports.h rename to src/src/kernel/reports.h diff --git a/src/common/kernel/resources.c b/src/src/kernel/resources.c similarity index 100% rename from src/common/kernel/resources.c rename to src/src/kernel/resources.c diff --git a/src/common/kernel/resources.h b/src/src/kernel/resources.h similarity index 100% rename from src/common/kernel/resources.h rename to src/src/kernel/resources.h diff --git a/src/common/kernel/save.c b/src/src/kernel/save.c similarity index 100% rename from src/common/kernel/save.c rename to src/src/kernel/save.c diff --git a/src/common/kernel/save.h b/src/src/kernel/save.h similarity index 100% rename from src/common/kernel/save.h rename to src/src/kernel/save.h diff --git a/src/common/kernel/ship.c b/src/src/kernel/ship.c similarity index 100% rename from src/common/kernel/ship.c rename to src/src/kernel/ship.c diff --git a/src/common/kernel/ship.h b/src/src/kernel/ship.h similarity index 100% rename from src/common/kernel/ship.h rename to src/src/kernel/ship.h diff --git a/src/common/kernel/skill.c b/src/src/kernel/skill.c similarity index 100% rename from src/common/kernel/skill.c rename to src/src/kernel/skill.c diff --git a/src/common/kernel/skill.h b/src/src/kernel/skill.h similarity index 100% rename from src/common/kernel/skill.h rename to src/src/kernel/skill.h diff --git a/src/common/kernel/spell.c b/src/src/kernel/spell.c similarity index 100% rename from src/common/kernel/spell.c rename to src/src/kernel/spell.c diff --git a/src/common/kernel/spell.h b/src/src/kernel/spell.h similarity index 100% rename from src/common/kernel/spell.h rename to src/src/kernel/spell.h diff --git a/src/common/kernel/spellid.h b/src/src/kernel/spellid.h similarity index 100% rename from src/common/kernel/spellid.h rename to src/src/kernel/spellid.h diff --git a/src/common/kernel/sqlite.c b/src/src/kernel/sqlite.c similarity index 100% rename from src/common/kernel/sqlite.c rename to src/src/kernel/sqlite.c diff --git a/src/common/kernel/teleport.c b/src/src/kernel/teleport.c similarity index 100% rename from src/common/kernel/teleport.c rename to src/src/kernel/teleport.c diff --git a/src/common/kernel/teleport.h b/src/src/kernel/teleport.h similarity index 100% rename from src/common/kernel/teleport.h rename to src/src/kernel/teleport.h diff --git a/src/common/kernel/terrain.c b/src/src/kernel/terrain.c similarity index 100% rename from src/common/kernel/terrain.c rename to src/src/kernel/terrain.c diff --git a/src/common/kernel/terrain.h b/src/src/kernel/terrain.h similarity index 100% rename from src/common/kernel/terrain.h rename to src/src/kernel/terrain.h diff --git a/src/common/kernel/terrainid.h b/src/src/kernel/terrainid.h similarity index 100% rename from src/common/kernel/terrainid.h rename to src/src/kernel/terrainid.h diff --git a/src/common/kernel/textstore.c b/src/src/kernel/textstore.c similarity index 100% rename from src/common/kernel/textstore.c rename to src/src/kernel/textstore.c diff --git a/src/common/kernel/textstore.h b/src/src/kernel/textstore.h similarity index 100% rename from src/common/kernel/textstore.h rename to src/src/kernel/textstore.h diff --git a/src/common/kernel/types.h b/src/src/kernel/types.h similarity index 100% rename from src/common/kernel/types.h rename to src/src/kernel/types.h diff --git a/src/common/kernel/unit.c b/src/src/kernel/unit.c similarity index 100% rename from src/common/kernel/unit.c rename to src/src/kernel/unit.c diff --git a/src/common/kernel/unit.h b/src/src/kernel/unit.h similarity index 100% rename from src/common/kernel/unit.h rename to src/src/kernel/unit.h diff --git a/src/common/kernel/version.h b/src/src/kernel/version.h similarity index 100% rename from src/common/kernel/version.h rename to src/src/kernel/version.h diff --git a/src/common/kernel/xmlkernel.h b/src/src/kernel/xmlkernel.h similarity index 100% rename from src/common/kernel/xmlkernel.h rename to src/src/kernel/xmlkernel.h diff --git a/src/common/kernel/xmlreader.c b/src/src/kernel/xmlreader.c similarity index 100% rename from src/common/kernel/xmlreader.c rename to src/src/kernel/xmlreader.c diff --git a/src/common/kernel/xmlreader.h b/src/src/kernel/xmlreader.h similarity index 100% rename from src/common/kernel/xmlreader.h rename to src/src/kernel/xmlreader.h diff --git a/src/common/lua-bindings.vcproj b/src/src/lua-bindings.vcproj similarity index 95% rename from src/common/lua-bindings.vcproj rename to src/src/lua-bindings.vcproj index 402507b04..fb5c4c80f 100644 --- a/src/common/lua-bindings.vcproj +++ b/src/src/lua-bindings.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..;../common;../external" + AdditionalIncludeDirectories=".;../external" PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -59,7 +59,7 @@ +#include #include #include #include diff --git a/src/common/modules/museum.h b/src/src/modules/museum.h similarity index 100% rename from src/common/modules/museum.h rename to src/src/modules/museum.h diff --git a/src/common/modules/oceannames.c b/src/src/modules/oceannames.c similarity index 100% rename from src/common/modules/oceannames.c rename to src/src/modules/oceannames.c diff --git a/src/common/modules/oceannames.h b/src/src/modules/oceannames.h similarity index 100% rename from src/common/modules/oceannames.h rename to src/src/modules/oceannames.h diff --git a/src/common/modules/score.c b/src/src/modules/score.c similarity index 100% rename from src/common/modules/score.c rename to src/src/modules/score.c diff --git a/src/common/modules/score.h b/src/src/modules/score.h similarity index 100% rename from src/common/modules/score.h rename to src/src/modules/score.h diff --git a/src/common/modules/weather.c b/src/src/modules/weather.c similarity index 100% rename from src/common/modules/weather.c rename to src/src/modules/weather.c diff --git a/src/common/modules/weather.h b/src/src/modules/weather.h similarity index 100% rename from src/common/modules/weather.h rename to src/src/modules/weather.h diff --git a/src/common/modules/wormhole.c b/src/src/modules/wormhole.c similarity index 100% rename from src/common/modules/wormhole.c rename to src/src/modules/wormhole.c diff --git a/src/common/modules/wormhole.h b/src/src/modules/wormhole.h similarity index 100% rename from src/common/modules/wormhole.h rename to src/src/modules/wormhole.h diff --git a/src/common/modules/xecmd.c b/src/src/modules/xecmd.c similarity index 100% rename from src/common/modules/xecmd.c rename to src/src/modules/xecmd.c diff --git a/src/common/modules/xecmd.h b/src/src/modules/xecmd.h similarity index 100% rename from src/common/modules/xecmd.h rename to src/src/modules/xecmd.h diff --git a/src/common/modules/xmas.c b/src/src/modules/xmas.c similarity index 100% rename from src/common/modules/xmas.c rename to src/src/modules/xmas.c diff --git a/src/common/modules/xmas.h b/src/src/modules/xmas.h similarity index 100% rename from src/common/modules/xmas.h rename to src/src/modules/xmas.h diff --git a/src/platform.h b/src/src/platform.h similarity index 100% rename from src/platform.h rename to src/src/platform.h diff --git a/src/common/races/Jamfile b/src/src/races/Jamfile similarity index 100% rename from src/common/races/Jamfile rename to src/src/races/Jamfile diff --git a/src/common/races/dragons.c b/src/src/races/dragons.c similarity index 100% rename from src/common/races/dragons.c rename to src/src/races/dragons.c diff --git a/src/common/races/dragons.h b/src/src/races/dragons.h similarity index 100% rename from src/common/races/dragons.h rename to src/src/races/dragons.h diff --git a/src/common/races/illusion.c b/src/src/races/illusion.c similarity index 100% rename from src/common/races/illusion.c rename to src/src/races/illusion.c diff --git a/src/common/races/illusion.h b/src/src/races/illusion.h similarity index 100% rename from src/common/races/illusion.h rename to src/src/races/illusion.h diff --git a/src/common/races/races.c b/src/src/races/races.c similarity index 100% rename from src/common/races/races.c rename to src/src/races/races.c diff --git a/src/common/races/races.h b/src/src/races/races.h similarity index 100% rename from src/common/races/races.h rename to src/src/races/races.h diff --git a/src/common/races/zombies.c b/src/src/races/zombies.c similarity index 100% rename from src/common/races/zombies.c rename to src/src/races/zombies.c diff --git a/src/common/races/zombies.h b/src/src/races/zombies.h similarity index 100% rename from src/common/races/zombies.h rename to src/src/races/zombies.h diff --git a/src/common/settings.h b/src/src/settings.h similarity index 100% rename from src/common/settings.h rename to src/src/settings.h diff --git a/src/common/tests.c b/src/src/tests.c similarity index 92% rename from src/common/tests.c rename to src/src/tests.c index 216b24be7..fc3c9a90c 100644 --- a/src/common/tests.c +++ b/src/src/tests.c @@ -1,4 +1,4 @@ -#include +#include #include CuSuite* get_base36_suite(void); diff --git a/src/common/tests.vcproj b/src/src/tests.vcproj similarity index 97% rename from src/common/tests.vcproj rename to src/src/tests.vcproj index f550bfded..89009d5f7 100644 --- a/src/common/tests.vcproj +++ b/src/src/tests.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..;../common;../external" + AdditionalIncludeDirectories=".;../external" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -124,7 +124,7 @@ /> -#include +#include #include "base36.h" diff --git a/src/common/util/bsdstring.c b/src/src/util/bsdstring.c similarity index 100% rename from src/common/util/bsdstring.c rename to src/src/util/bsdstring.c diff --git a/src/common/util/bsdstring.h b/src/src/util/bsdstring.h similarity index 100% rename from src/common/util/bsdstring.h rename to src/src/util/bsdstring.h diff --git a/src/common/util/console.c b/src/src/util/console.c similarity index 100% rename from src/common/util/console.c rename to src/src/util/console.c diff --git a/src/common/util/console.h b/src/src/util/console.h similarity index 100% rename from src/common/util/console.h rename to src/src/util/console.h diff --git a/src/common/util/crmessage.c b/src/src/util/crmessage.c similarity index 100% rename from src/common/util/crmessage.c rename to src/src/util/crmessage.c diff --git a/src/common/util/crmessage.h b/src/src/util/crmessage.h similarity index 100% rename from src/common/util/crmessage.h rename to src/src/util/crmessage.h diff --git a/src/common/util/cvector.c b/src/src/util/cvector.c similarity index 100% rename from src/common/util/cvector.c rename to src/src/util/cvector.c diff --git a/src/common/util/cvector.h b/src/src/util/cvector.h similarity index 100% rename from src/common/util/cvector.h rename to src/src/util/cvector.h diff --git a/src/common/util/dice.c b/src/src/util/dice.c similarity index 100% rename from src/common/util/dice.c rename to src/src/util/dice.c diff --git a/src/common/util/event.c b/src/src/util/event.c similarity index 100% rename from src/common/util/event.c rename to src/src/util/event.c diff --git a/src/common/util/event.h b/src/src/util/event.h similarity index 100% rename from src/common/util/event.h rename to src/src/util/event.h diff --git a/src/common/util/eventbus.c b/src/src/util/eventbus.c similarity index 100% rename from src/common/util/eventbus.c rename to src/src/util/eventbus.c diff --git a/src/common/util/eventbus.h b/src/src/util/eventbus.h similarity index 100% rename from src/common/util/eventbus.h rename to src/src/util/eventbus.h diff --git a/src/common/util/filereader.c b/src/src/util/filereader.c similarity index 100% rename from src/common/util/filereader.c rename to src/src/util/filereader.c diff --git a/src/common/util/filereader.h b/src/src/util/filereader.h similarity index 100% rename from src/common/util/filereader.h rename to src/src/util/filereader.h diff --git a/src/common/util/functions.c b/src/src/util/functions.c similarity index 100% rename from src/common/util/functions.c rename to src/src/util/functions.c diff --git a/src/common/util/functions.h b/src/src/util/functions.h similarity index 100% rename from src/common/util/functions.h rename to src/src/util/functions.h diff --git a/src/common/util/goodies.c b/src/src/util/goodies.c similarity index 100% rename from src/common/util/goodies.c rename to src/src/util/goodies.c diff --git a/src/common/util/goodies.h b/src/src/util/goodies.h similarity index 100% rename from src/common/util/goodies.h rename to src/src/util/goodies.h diff --git a/src/common/util/graph.c b/src/src/util/graph.c similarity index 100% rename from src/common/util/graph.c rename to src/src/util/graph.c diff --git a/src/common/util/graph.h b/src/src/util/graph.h similarity index 100% rename from src/common/util/graph.h rename to src/src/util/graph.h diff --git a/src/common/util/language.c b/src/src/util/language.c similarity index 100% rename from src/common/util/language.c rename to src/src/util/language.c diff --git a/src/common/util/language.h b/src/src/util/language.h similarity index 100% rename from src/common/util/language.h rename to src/src/util/language.h diff --git a/src/common/util/language_struct.h b/src/src/util/language_struct.h similarity index 100% rename from src/common/util/language_struct.h rename to src/src/util/language_struct.h diff --git a/src/common/util/listbox.c b/src/src/util/listbox.c similarity index 100% rename from src/common/util/listbox.c rename to src/src/util/listbox.c diff --git a/src/common/util/listbox.h b/src/src/util/listbox.h similarity index 100% rename from src/common/util/listbox.h rename to src/src/util/listbox.h diff --git a/src/common/util/lists.c b/src/src/util/lists.c similarity index 100% rename from src/common/util/lists.c rename to src/src/util/lists.c diff --git a/src/common/util/lists.h b/src/src/util/lists.h similarity index 100% rename from src/common/util/lists.h rename to src/src/util/lists.h diff --git a/src/common/util/log.c b/src/src/util/log.c similarity index 100% rename from src/common/util/log.c rename to src/src/util/log.c diff --git a/src/common/util/log.h b/src/src/util/log.h similarity index 100% rename from src/common/util/log.h rename to src/src/util/log.h diff --git a/src/common/util/message.c b/src/src/util/message.c similarity index 100% rename from src/common/util/message.c rename to src/src/util/message.c diff --git a/src/common/util/message.h b/src/src/util/message.h similarity index 100% rename from src/common/util/message.h rename to src/src/util/message.h diff --git a/src/common/util/nrmessage.c b/src/src/util/nrmessage.c similarity index 100% rename from src/common/util/nrmessage.c rename to src/src/util/nrmessage.c diff --git a/src/common/util/nrmessage.h b/src/src/util/nrmessage.h similarity index 100% rename from src/common/util/nrmessage.h rename to src/src/util/nrmessage.h diff --git a/src/common/util/nrmessage_struct.h b/src/src/util/nrmessage_struct.h similarity index 100% rename from src/common/util/nrmessage_struct.h rename to src/src/util/nrmessage_struct.h diff --git a/src/common/util/parser.c b/src/src/util/parser.c similarity index 100% rename from src/common/util/parser.c rename to src/src/util/parser.c diff --git a/src/common/util/parser.h b/src/src/util/parser.h similarity index 100% rename from src/common/util/parser.h rename to src/src/util/parser.h diff --git a/src/common/util/patricia.c b/src/src/util/patricia.c similarity index 100% rename from src/common/util/patricia.c rename to src/src/util/patricia.c diff --git a/src/common/util/patricia.h b/src/src/util/patricia.h similarity index 100% rename from src/common/util/patricia.h rename to src/src/util/patricia.h diff --git a/src/common/util/rand.c b/src/src/util/rand.c similarity index 100% rename from src/common/util/rand.c rename to src/src/util/rand.c diff --git a/src/common/util/rand.h b/src/src/util/rand.h similarity index 100% rename from src/common/util/rand.h rename to src/src/util/rand.h diff --git a/src/common/util/resolve.c b/src/src/util/resolve.c similarity index 100% rename from src/common/util/resolve.c rename to src/src/util/resolve.c diff --git a/src/common/util/resolve.h b/src/src/util/resolve.h similarity index 100% rename from src/common/util/resolve.h rename to src/src/util/resolve.h diff --git a/src/common/util/rng.h b/src/src/util/rng.h similarity index 100% rename from src/common/util/rng.h rename to src/src/util/rng.h diff --git a/src/common/util/sql.c b/src/src/util/sql.c similarity index 100% rename from src/common/util/sql.c rename to src/src/util/sql.c diff --git a/src/common/util/sql.h b/src/src/util/sql.h similarity index 100% rename from src/common/util/sql.h rename to src/src/util/sql.h diff --git a/src/common/util/storage.h b/src/src/util/storage.h similarity index 100% rename from src/common/util/storage.h rename to src/src/util/storage.h diff --git a/src/common/util/strings.c b/src/src/util/strings.c similarity index 100% rename from src/common/util/strings.c rename to src/src/util/strings.c diff --git a/src/common/util/strncpy.c b/src/src/util/strncpy.c similarity index 100% rename from src/common/util/strncpy.c rename to src/src/util/strncpy.c diff --git a/src/common/util/translation.c b/src/src/util/translation.c similarity index 100% rename from src/common/util/translation.c rename to src/src/util/translation.c diff --git a/src/common/util/translation.h b/src/src/util/translation.h similarity index 100% rename from src/common/util/translation.h rename to src/src/util/translation.h diff --git a/src/common/util/umlaut.c b/src/src/util/umlaut.c similarity index 100% rename from src/common/util/umlaut.c rename to src/src/util/umlaut.c diff --git a/src/common/util/umlaut.h b/src/src/util/umlaut.h similarity index 100% rename from src/common/util/umlaut.h rename to src/src/util/umlaut.h diff --git a/src/common/util/unicode.c b/src/src/util/unicode.c similarity index 100% rename from src/common/util/unicode.c rename to src/src/util/unicode.c diff --git a/src/common/util/unicode.h b/src/src/util/unicode.h similarity index 100% rename from src/common/util/unicode.h rename to src/src/util/unicode.h diff --git a/src/common/util/variant.h b/src/src/util/variant.h similarity index 100% rename from src/common/util/variant.h rename to src/src/util/variant.h diff --git a/src/common/util/vmap.c b/src/src/util/vmap.c similarity index 100% rename from src/common/util/vmap.c rename to src/src/util/vmap.c diff --git a/src/common/util/vmap.h b/src/src/util/vmap.h similarity index 100% rename from src/common/util/vmap.h rename to src/src/util/vmap.h diff --git a/src/common/util/vset.c b/src/src/util/vset.c similarity index 100% rename from src/common/util/vset.c rename to src/src/util/vset.c diff --git a/src/common/util/vset.h b/src/src/util/vset.h similarity index 100% rename from src/common/util/vset.h rename to src/src/util/vset.h diff --git a/src/common/util/windir.c b/src/src/util/windir.c similarity index 100% rename from src/common/util/windir.c rename to src/src/util/windir.c diff --git a/src/common/util/windir.h b/src/src/util/windir.h similarity index 100% rename from src/common/util/windir.h rename to src/src/util/windir.h diff --git a/src/common/util/xml.c b/src/src/util/xml.c similarity index 100% rename from src/common/util/xml.c rename to src/src/util/xml.c diff --git a/src/common/util/xml.h b/src/src/util/xml.h similarity index 100% rename from src/common/util/xml.h rename to src/src/util/xml.h