OSDN Git Service

[Refactor] #2403 Separated apply-magic-arrow.cpp/h from apply-magic.cpp
[hengbandforosx/hengbandosx.git] / src / Makefile.am
index e7c4d9a..27a9d8e 100644 (file)
@@ -365,12 +365,12 @@ hengband_SOURCES = \
        load/monster/monster-loader-factory.cpp load/monster/monster-loader-factory.h \
        load/monster/monster-loader-version-types.h \
        \
-       load/old/item-flag-types-savefile10.h \
-       load/old/item-loader-savefile10.cpp load/old/item-loader-savefile10.h \
+       load/old/item-flag-types-savefile50.h \
+       load/old/item-loader-savefile50.cpp load/old/item-loader-savefile50.h \
        load/old/load-v1-5-0.cpp load/old/load-v1-5-0.h \
        load/old/load-v1-7-0.cpp load/old/load-v1-7-0.h \
-       load/old/monster-flag-types-savefile10.h \
-       load/old/monster-loader-savefile10.cpp load/old/monster-loader-savefile10.h \
+       load/old/monster-flag-types-savefile50.h \
+       load/old/monster-loader-savefile50.cpp load/old/monster-loader-savefile50.h \
        \
        locale/english.cpp locale/english.h \
        locale/japanese.cpp locale/japanese.h \
@@ -407,6 +407,7 @@ hengband_SOURCES = \
        market/poker.cpp market/poker.h \
        market/arena.cpp market/arena.h \
        market/bounty-prize-table.cpp market/bounty-prize-table.h \
+       market/bounty-type-definition.h \
        market/bounty.cpp market/bounty.h \
        market/building-recharger.cpp market/building-recharger.h \
        market/building-quest.cpp market/building-quest.h \
@@ -482,8 +483,7 @@ hengband_SOURCES = \
        monster-attack/monster-attack-processor.cpp monster-attack/monster-attack-processor.h \
        monster-attack/monster-attack-status.cpp monster-attack/monster-attack-status.h \
        monster-attack/monster-attack-switcher.cpp monster-attack/monster-attack-switcher.h \
-       monster-attack/monster-attack-types.cpp monster-attack/monster-attack-types.h \
-       monster-attack/monster-attack-util.cpp monster-attack/monster-attack-util.h \
+       monster-attack/monster-attack-table.cpp monster-attack/monster-attack-table.h \
        monster-attack/monster-eating.cpp monster-attack/monster-eating.h \
        \
        monster-floor/monster-death.cpp monster-floor/monster-death.h \
@@ -506,16 +506,22 @@ hengband_SOURCES = \
        monster-floor/special-death-switcher.cpp monster-floor/special-death-switcher.h \
        \
        monster-race/monster-aura-types.h \
+       monster-race/monster-kind-mask.cpp monster-race/monster-kind-mask.h \
        monster-race/monster-race.cpp monster-race/monster-race.h \
        monster-race/monster-race-hook.cpp monster-race/monster-race-hook.h \
        monster-race/race-ability-flags.h \
        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-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-flags9.h \
        monster-race/race-indice-types.h \
+       monster-race/race-kind-flags.h \
+       monster-race/race-resistance-mask.cpp monster-race/race-resistance-mask.h \
+       monster-race/race-visual-flags.h \
        \
        mspell/assign-monster-spell.cpp mspell/assign-monster-spell.h \
        mspell/element-resistance-checker.cpp mspell/element-resistance-checker.h \
@@ -524,24 +530,24 @@ 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-breath.cpp mspell/mspell-breath.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-dispel.cpp mspell/mspell-dispel.h \
+       mspell/mspell-floor.cpp mspell/mspell-floor.h \
        mspell/mspell-judgement.cpp mspell/mspell-judgement.h \
-       mspell/mspell-lite.cpp mspell/mspell-lite.h \
-       mspell/mspell-summon.cpp mspell/mspell-summon.h \
-       mspell/mspell-util.cpp mspell/mspell-util.h \
-       mspell/mspell-damage-calculator.cpp mspell/mspell-damage-calculator.h \
        mspell/mspell-learn-checker.cpp mspell/mspell-learn-checker.h \
-       mspell/mspell-floor.cpp mspell/mspell-floor.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 \
        mspell/mspell-status.cpp mspell/mspell-status.h \
-       mspell/mspell-particularity.cpp mspell/mspell-particularity.h \
        mspell/mspell-selector.cpp mspell/mspell-selector.h \
-       mspell/mspell.h \
+       mspell/mspell-util.cpp mspell/mspell-util.h \
        mspell/smart-mspell-util.cpp mspell/smart-mspell-util.h \
        mspell/specified-summon.cpp mspell/specified-summon.h \
        mspell/summon-checker.cpp mspell/summon-checker.h \
@@ -581,36 +587,43 @@ hengband_SOURCES = \
        object-activation/activation-teleport.cpp object-activation/activation-teleport.h \
        object-activation/activation-util.cpp object-activation/activation-util.h \
        \
-       object-enchant/abstract-protector-enchanter.cpp object-enchant/abstract-protector-enchanter.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/apply-magic-amulet.cpp object-enchant/apply-magic-amulet.h \
-       object-enchant/apply-magic-armor.cpp object-enchant/apply-magic-armor.h \
-       object-enchant/apply-magic-boots.cpp object-enchant/apply-magic-boots.h \
-       object-enchant/apply-magic-cloak.cpp object-enchant/apply-magic-cloak.h \
-       object-enchant/apply-magic-crown.cpp object-enchant/apply-magic-crown.h \
-       object-enchant/apply-magic-gloves.cpp object-enchant/apply-magic-gloves.h \
-       object-enchant/apply-magic-helm.cpp object-enchant/apply-magic-helm.h \
-       object-enchant/apply-magic-others.cpp object-enchant/apply-magic-others.h \
-       object-enchant/apply-magic-ring.cpp object-enchant/apply-magic-ring.h \
-       object-enchant/apply-magic-shield.cpp object-enchant/apply-magic-shield.h \
-       object-enchant/apply-magic-weapon.cpp object-enchant/apply-magic-weapon.h \
        object-enchant/dragon-breaths-table.cpp object-enchant/dragon-breaths-table.h \
        object-enchant/enchanter-base.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 \
-       object-enchant/object-smith.cpp object-enchant/object-smith.h \
        object-enchant/item-apply-magic.h object-enchant/item-feeling.h \
        object-enchant/old-ego-extra-values.h object-enchant/special-object-flags.h \
-       object-enchant/smith-info.cpp object-enchant/smith-info.h \
-       object-enchant/smith-tables.cpp object-enchant/smith-tables.h \
-       object-enchant/smith-types.h \
        object-enchant/tr-flags.h \
        object-enchant/tr-types.h object-enchant/trc-types.h \
        object-enchant/trg-types.h \
        object-enchant/vorpal-weapon.cpp object-enchant/vorpal-weapon.h \
        \
+       object-enchant/others/apply-magic-amulet.cpp object-enchant/others/apply-magic-amulet.h \
+       object-enchant/others/apply-magic-lite.cpp object-enchant/others/apply-magic-lite.h \
+       object-enchant/others/apply-magic-ring.cpp object-enchant/others/apply-magic-ring.h \
+       object-enchant/others/apply-magic-others.cpp object-enchant/others/apply-magic-others.h \
+       \
+       object-enchant/protector/abstract-protector-enchanter.cpp object-enchant/protector/abstract-protector-enchanter.h \
+       object-enchant/protector/apply-magic-armor.cpp object-enchant/protector/apply-magic-armor.h \
+       object-enchant/protector/apply-magic-boots.cpp object-enchant/protector/apply-magic-boots.h \
+       object-enchant/protector/apply-magic-cloak.cpp object-enchant/protector/apply-magic-cloak.h \
+       object-enchant/protector/apply-magic-crown.cpp object-enchant/protector/apply-magic-crown.h \
+       object-enchant/protector/apply-magic-dragon-armor.cpp object-enchant/protector/apply-magic-dragon-armor.h \
+       object-enchant/protector/apply-magic-gloves.cpp object-enchant/protector/apply-magic-gloves.h \
+       object-enchant/protector/apply-magic-hard-armor.cpp object-enchant/protector/apply-magic-hard-armor.h \
+       object-enchant/protector/apply-magic-helm.cpp object-enchant/protector/apply-magic-helm.h \
+       object-enchant/protector/apply-magic-shield.cpp object-enchant/protector/apply-magic-shield.h \
+       object-enchant/protector/apply-magic-soft-armor.cpp object-enchant/protector/apply-magic-soft-armor.h \
+       \
+       object-enchant/weapon/abstract-weapon-enchanter.cpp object-enchant/weapon/abstract-weapon-enchanter.h \
+       object-enchant/weapon/apply-magic-arrow.cpp object-enchant/weapon/apply-magic-arrow.h \
+       object-enchant/weapon/apply-magic-digging.cpp object-enchant/weapon/apply-magic-digging.h \
+       object-enchant/weapon/apply-magic-sword.cpp object-enchant/weapon/apply-magic-sword.h \
+       object-enchant/weapon/apply-magic-weapon.cpp object-enchant/weapon/apply-magic-weapon.h \
+       \
        object-hook/hook-armor.cpp object-hook/hook-armor.h \
        object-hook/hook-expendable.cpp object-hook/hook-expendable.h \
        object-hook/hook-magic.cpp object-hook/hook-magic.h \
@@ -619,13 +632,22 @@ hengband_SOURCES = \
        object-hook/hook-weapon.cpp object-hook/hook-weapon.h \
        \
        object-use/item-use-checker.cpp object-use/item-use-checker.h \
-       object-use/quaff-execution.cpp object-use/quaff-execution.h \
-       object-use/read-execution.cpp object-use/read-execution.h \
        object-use/throw-execution.cpp object-use/throw-execution.h \
        object-use/use-execution.cpp object-use/use-execution.h \
        object-use/zaprod-execution.cpp object-use/zaprod-execution.h \
        object-use/zapwand-execution.cpp object-use/zapwand-execution.h \
        \
+       object-use/quaff/quaff-effects.cpp object-use/quaff/quaff-effects.h \
+       object-use/quaff/quaff-execution.cpp object-use/quaff/quaff-execution.h \
+       \
+       object-use/read/read-execution.cpp object-use/read/read-execution.h \
+       object-use/read/gbh-shirt-read-executor.cpp object-use/read/gbh-shirt-read-executor.h \
+       object-use/read/parchment-read-executor.cpp object-use/read/parchment-read-executor.h \
+       object-use/read/read-executor-base.h \
+       object-use/read/read-executor-factory.cpp object-use/read/read-executor-factory.h \
+       object-use/read/ring-power-read-executor.cpp object-use/read/ring-power-read-executor.h \
+       object-use/read/scroll-read-executor.cpp object-use/read/scroll-read-executor.h \
+       \
        perception/identification.cpp perception/identification.h \
        perception/object-perception.cpp perception/object-perception.h \
        perception/simple-perception.cpp perception/simple-perception.h \
@@ -638,7 +660,7 @@ hengband_SOURCES = \
        player/patron.cpp player/patron.h \
        player/process-death.cpp player/process-death.h \
        player/process-name.cpp player/process-name.h \
-       player/race-info-table.cpp player/race-info-table.h\
+       player/race-info-table.cpp player/race-info-table.h \
        player/race-resistances.cpp player/race-resistances.h \
        player/permanent-resistances.cpp player/permanent-resistances.h \
        player/temporary-resistances.cpp player/temporary-resistances.h \
@@ -697,9 +719,9 @@ hengband_SOURCES = \
        player-info/samurai-data-type.h \
        player-info/self-info.cpp player-info/self-info.h \
        player-info/self-info-util.cpp player-info/self-info-util.h \
-        player-info/smith-data-type.h \
+       player-info/smith-data-type.h \
        player-info/sniper-data-type.h \
-        player-info/spell-hex-data-type.h \
+       player-info/spell-hex-data-type.h \
        player-info/weapon-effect-info.cpp player-info/weapon-effect-info.h \
        \
        player-status/player-hand-types.h \
@@ -766,6 +788,11 @@ hengband_SOURCES = \
        save/save.cpp save/save.h \
        save/save-util.cpp save/save-util.h \
        \
+       smith/object-smith.cpp smith/object-smith.h \
+       smith/smith-info.cpp smith/smith-info.h \
+       smith/smith-tables.cpp smith/smith-tables.h \
+       smith/smith-types.h \
+       \
        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 \
@@ -792,6 +819,8 @@ hengband_SOURCES = \
        spell/summon-types.h \
        spell/technic-info-table.cpp spell/technic-info-table.h \
        \
+       spell-class/spells-mirror-master.cpp spell-class/spells-mirror-master.h \
+       \
        spell-kind/blood-curse.cpp spell-kind/blood-curse.h \
        spell-kind/earthquake.cpp spell-kind/earthquake.h \
        spell-kind/magic-item-recharger.cpp spell-kind/magic-item-recharger.h \
@@ -868,6 +897,7 @@ hengband_SOURCES = \
        \
        system/alloc-entries.cpp system/alloc-entries.h \
        system/angband.h \
+       system/angband-exceptions.h \
        system/angband-version.cpp system/angband-version.h \
        system/artifact-type-definition.cpp system/artifact-type-definition.h \
        system/building-type-definition.cpp system/building-type-definition.h \
@@ -876,7 +906,7 @@ hengband_SOURCES = \
        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-define.h system/h-system.h system/h-type.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 \
@@ -900,7 +930,11 @@ 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-confusion.cpp timed-effect/player-confusion.h \
        timed-effect/player-cut.cpp timed-effect/player-cut.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-stun.cpp timed-effect/player-stun.h \
        timed-effect/timed-effects.cpp timed-effect/timed-effects.h \
        \
@@ -1001,7 +1035,7 @@ EXTRA_DIST = \
 DEFAULT_INCLUDES = -I$(srcdir) -I$(top_builddir)/src
 CPPFLAGS += $(XFT_CFLAGS) $(libcurl_CFLAGS)
 if PCH
-CPPFLAGS += -include stdafx.h
+CPPFLAGS += -include ../src/stdafx.h
 endif
 LIBS += $(XFT_LIBS) $(libcurl_LIBS)
 COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -1026,3 +1060,4 @@ endif
 
 clean-local:
        -rm stdafx.h.gch stdafx.h.gch.sum
+       -rm -rf ../build