OSDN Git Service

Merge pull request #2856 from sikabane-works/release/3.0.0Alpha72
[hengbandforosx/hengbandosx.git] / src / Makefile.am
index cea77d5..fb64d11 100644 (file)
@@ -164,7 +164,6 @@ hengband_SOURCES = \
        core/visuals-reseter.cpp core/visuals-reseter.h \
        core/window-redrawer.cpp core/window-redrawer.h \
        \
-       dungeon/dungeon.cpp dungeon/dungeon.h \
        dungeon/dungeon-flag-mask.h \
        dungeon/dungeon-flag-types.h \
        dungeon/dungeon-processor.cpp dungeon/dungeon-processor.h \
@@ -227,7 +226,6 @@ hengband_SOURCES = \
        floor/object-allocator.cpp floor/object-allocator.h \
        floor/object-scanner.cpp floor/object-scanner.h \
        floor/pattern-walk.cpp floor/pattern-walk.h \
-       floor/sight-definitions.h \
        floor/tunnel-generator.cpp floor/tunnel-generator.h \
        floor/wild.h floor/wild.cpp \
        \
@@ -262,6 +260,8 @@ hengband_SOURCES = \
        hpmp/hp-mp-regenerator.cpp hpmp/hp-mp-regenerator.h \
        \
        info-reader/artifact-reader.cpp info-reader/artifact-reader.h \
+       info-reader/baseitem-reader.cpp info-reader/baseitem-reader.h \
+       info-reader/baseitem-tokens-table.cpp info-reader/baseitem-tokens-table.h \
        info-reader/dungeon-info-tokens-table.cpp info-reader/dungeon-info-tokens-table.h \
        info-reader/dungeon-reader.cpp info-reader/dungeon-reader.h \
        info-reader/ego-reader.cpp info-reader/ego-reader.h \
@@ -270,8 +270,6 @@ hengband_SOURCES = \
        info-reader/fixed-map-parser.cpp info-reader/fixed-map-parser.h \
        info-reader/general-parser.cpp info-reader/general-parser.h \
        info-reader/info-reader-util.cpp info-reader/info-reader-util.h \
-       info-reader/kind-info-tokens-table.cpp info-reader/kind-info-tokens-table.h \
-       info-reader/kind-reader.cpp info-reader/kind-reader.h \
        info-reader/magic-reader.cpp info-reader/magic-reader.h \
        info-reader/parse-error-types.h \
        info-reader/race-info-tokens-table.cpp info-reader/race-info-tokens-table.h \
@@ -513,13 +511,17 @@ hengband_SOURCES = \
        monster-race/race-ability-mask.cpp monster-race/race-ability-mask.h \
        monster-race/race-behavior-flags.h \
        monster-race/race-drop-flags.h \
+       monster-race/race-feature-flags.h \
+       monster-race/race-feature-mask.cpp monster-race/race-feature-mask.h \
        monster-race/race-flags-resistance.h \
        monster-race/race-flags1.h monster-race/race-flags2.h \
        monster-race/race-flags3.h \
        monster-race/race-flags7.h monster-race/race-flags8.h \
        monster-race/race-indice-types.h \
        monster-race/race-kind-flags.h \
+       monster-race/race-population-flags.h \
        monster-race/race-resistance-mask.cpp monster-race/race-resistance-mask.h \
+       monster-race/race-speak-flags.h \
        monster-race/race-visual-flags.h \
        monster-race/race-wilderness-flags.h \
        \
@@ -530,18 +532,14 @@ hengband_SOURCES = \
        mspell/monster-power-table.cpp mspell/monster-power-table.h \
        mspell/mspell-attack.cpp mspell/mspell-attack.h \
        mspell/mspell-attack-util.cpp mspell/mspell-attack-util.h \
-       mspell/mspell-ball.cpp mspell/mspell-ball.h \
-       mspell/mspell-bolt.cpp mspell/mspell-bolt.h \
-       mspell/mspell-breath.cpp mspell/mspell-breath.h \
        mspell/mspell-checker.cpp mspell/mspell-checker.h \
-       mspell/mspell-curse.cpp mspell/mspell-curse.h \
        mspell/mspell-damage-calculator.cpp mspell/mspell-damage-calculator.h \
+       mspell/mspell-data.cpp mspell/mspell-data.h \
        mspell/mspell-dispel.cpp mspell/mspell-dispel.h \
        mspell/mspell-floor.cpp mspell/mspell-floor.h \
        mspell/mspell-judgement.cpp mspell/mspell-judgement.h \
        mspell/mspell-learn-checker.cpp mspell/mspell-learn-checker.h \
        mspell/mspell-lite.cpp mspell/mspell-lite.h \
-       mspell/mspell-particularity.cpp mspell/mspell-particularity.h \
        mspell/mspell-result.h \
        mspell/mspell-special.cpp mspell/mspell-special.h \
        mspell/mspell-summon.cpp mspell/mspell-summon.h \
@@ -552,6 +550,13 @@ hengband_SOURCES = \
        mspell/specified-summon.cpp mspell/specified-summon.h \
        mspell/summon-checker.cpp mspell/summon-checker.h \
        \
+       mspell/mspell-attack/abstract-mspell.cpp mspell/mspell-attack/abstract-mspell.h \
+       mspell/mspell-attack/mspell-ball.cpp mspell/mspell-attack/mspell-ball.h \
+       mspell/mspell-attack/mspell-bolt.cpp mspell/mspell-attack/mspell-bolt.h \
+       mspell/mspell-attack/mspell-breath.cpp mspell/mspell-attack/mspell-breath.h \
+       mspell/mspell-attack/mspell-curse.cpp mspell/mspell-attack/mspell-curse.h \
+       mspell/mspell-attack/mspell-particularity.cpp mspell/mspell-attack/mspell-particularity.h \
+       \
        mutation/gain-mutation-switcher.cpp mutation/gain-mutation-switcher.h \
        mutation/lose-mutation-switcher.cpp mutation/lose-mutation-switcher.h \
        mutation/mutation-calculator.cpp mutation/mutation-calculator.h \
@@ -566,7 +571,6 @@ hengband_SOURCES = \
        object/object-flags.cpp object/object-flags.h \
        object/object-index-list.cpp object/object-index-list.h \
        object/object-info.cpp object/object-info.h \
-       object/object-kind.cpp object/object-kind.h \
        object/object-kind-hook.cpp object/object-kind-hook.h \
        object/object-stack.cpp object/object-stack.h \
        object/object-value.cpp object/object-value.h \
@@ -588,9 +592,10 @@ hengband_SOURCES = \
        object-activation/activation-util.cpp object-activation/activation-util.h \
        \
        object-enchant/activation-info-table.cpp object-enchant/activation-info-table.h \
-       object-enchant/apply-magic.cpp object-enchant/apply-magic.h \
        object-enchant/dragon-breaths-table.cpp object-enchant/dragon-breaths-table.h \
        object-enchant/enchanter-base.h \
+       object-enchant/enchanter-factory.cpp object-enchant/enchanter-factory.h \
+       object-enchant/item-magic-applier.cpp object-enchant/item-magic-applier.h \
        object-enchant/object-boost.cpp object-enchant/object-boost.h \
        object-enchant/object-curse.cpp object-enchant/object-curse.h \
        object-enchant/object-ego.cpp object-enchant/object-ego.h \
@@ -622,7 +627,10 @@ hengband_SOURCES = \
        object-enchant/weapon/apply-magic-arrow.cpp object-enchant/weapon/apply-magic-arrow.h \
        object-enchant/weapon/apply-magic-bow.cpp object-enchant/weapon/apply-magic-bow.h \
        object-enchant/weapon/apply-magic-digging.cpp object-enchant/weapon/apply-magic-digging.h \
+       object-enchant/weapon/apply-magic-hafted.cpp object-enchant/weapon/apply-magic-hafted.h \
+       object-enchant/weapon/apply-magic-polearm.cpp object-enchant/weapon/apply-magic-polearm.h \
        object-enchant/weapon/apply-magic-sword.cpp object-enchant/weapon/apply-magic-sword.h \
+       object-enchant/weapon/melee-weapon-enchanter.cpp object-enchant/weapon/melee-weapon-enchanter.h \
        \
        object-hook/hook-armor.cpp object-hook/hook-armor.h \
        object-hook/hook-expendable.cpp object-hook/hook-expendable.h \
@@ -795,7 +803,6 @@ hengband_SOURCES = \
        \
        specific-object/blade-turner.cpp specific-object/blade-turner.h \
        specific-object/bloody-moon.cpp specific-object/bloody-moon.h \
-       specific-object/bow.cpp specific-object/bow.h \
        specific-object/chest.cpp specific-object/chest.h \
        specific-object/death-crimson.cpp specific-object/death-crimson.h \
        specific-object/death-scythe.cpp specific-object/death-scythe.h \
@@ -900,18 +907,21 @@ hengband_SOURCES = \
        system/angband-exceptions.h \
        system/angband-version.cpp system/angband-version.h \
        system/artifact-type-definition.cpp system/artifact-type-definition.h \
+       system/baseitem-info.cpp system/baseitem-info.h \
        system/building-type-definition.cpp system/building-type-definition.h \
        system/dungeon-data-definition.h \
-       system/floor-type-definition.h \
+       system/dungeon-info.cpp system/dungeon-info.h \
+       system/floor-type-definition.cpp system/floor-type-definition.h \
        system/grid-type-definition.cpp system/grid-type-definition.h \
        system/game-option-types.h \
        system/h-basic.h system/h-config.h \
        system/h-system.h system/h-type.h \
-       system/monster-race-definition.h \
-       system/monster-type-definition.h \
-       system/object-type-definition.cpp system/object-type-definition.h \
+       system/item-entity.cpp system/item-entity.h \
+       system/monster-entity.cpp system/monster-entity.h \
+       system/monster-race-info.h \
        system/player-type-definition.cpp system/player-type-definition.h \
        system/system-variables.cpp system/system-variables.h \
+       system/terrain-type-definition.cpp system/terrain-type-definition.h \
        system/gamevalue.h \
        \
        target/grid-selector.cpp target/grid-selector.h \
@@ -930,11 +940,15 @@ hengband_SOURCES = \
        term/z-term.cpp term/z-term.h term/z-util.cpp term/z-util.h \
        term/z-virt.cpp term/z-virt.h \
        \
+       timed-effect/player-acceleration.cpp timed-effect/player-acceleration.h \
+       timed-effect/player-blindness.cpp timed-effect/player-blindness.h \
        timed-effect/player-confusion.cpp timed-effect/player-confusion.h \
        timed-effect/player-cut.cpp timed-effect/player-cut.h \
+       timed-effect/player-deceleration.cpp timed-effect/player-deceleration.h \
        timed-effect/player-fear.cpp timed-effect/player-fear.h \
        timed-effect/player-hallucination.cpp timed-effect/player-hallucination.h \
        timed-effect/player-paralysis.cpp timed-effect/player-paralysis.h \
+       timed-effect/player-poison.cpp timed-effect/player-poison.h \
        timed-effect/player-stun.cpp timed-effect/player-stun.h \
        timed-effect/timed-effects.cpp timed-effect/timed-effects.h \
        \
@@ -952,7 +966,6 @@ hengband_SOURCES = \
        util/rng-xoshiro.cpp util/rng-xoshiro.h \
        util/sort.cpp util/sort.h \
        util/string-processor.cpp util/string-processor.h \
-       util/tag-sorter.cpp util/tag-sorter.h \
        \
        view/display-birth.cpp view/display-birth.h \
        view/display-characteristic.cpp view/display-characteristic.h \