core/magic-effects-timeout-reducer.cpp core/magic-effects-timeout-reducer.h \
core/object-compressor.cpp core/object-compressor.h \
core/player-processor.cpp core/player-processor.h \
- core/player-redraw-types.h \
- core/player-update-types.h \
core/score-util.cpp core/score-util.h \
core/scores.cpp core/scores.h \
core/show-file.cpp core/show-file.h \
io/exit-panic.cpp io/exit-panic.h \
io/files-util.cpp io/files-util.h \
io/gf-descriptions.cpp io/gf-descriptions.h \
- io/inet.cpp io/inet.h \
io/input-key-acceptor.cpp io/input-key-acceptor.h \
io/input-key-processor.cpp io/input-key-processor.h \
io/input-key-requester.cpp io/input-key-requester.h \
main/scene-table-monster.cpp main/scene-table-monster.h \
main/sound-definitions-table.cpp main/sound-definitions-table.h \
main/sound-of-music.cpp main/sound-of-music.h \
- main/x11-gamma-builder.cpp main/x11-gamma-builder.h \
- main/x11-type-string.cpp main/x11-type-string.h \
+ \
+ main-unix/unix-user-ids.cpp main-unix/unix-user-ids.h \
+ main-unix/x11-gamma-builder.cpp main-unix/x11-gamma-builder.h \
+ main-unix/x11-type-string.cpp main-unix/x11-type-string.h \
\
market/arena-info-table.cpp market/arena-info-table.h \
market/building-initializer.cpp market/building-initializer.h \
player-ability/player-strength.cpp player-ability/player-strength.h \
player-ability/player-wisdom.cpp player-ability/player-wisdom.h \
\
- player-attack/player-attack-util.h \
player-attack/attack-chaos-effect.cpp player-attack/attack-chaos-effect.h \
player-attack/blood-sucking-processor.cpp player-attack/blood-sucking-processor.h \
player-attack/player-attack.cpp player-attack/player-attack.h \
system/h-system.h system/h-type.h \
system/item-entity.cpp system/item-entity.h \
system/monster-entity.cpp system/monster-entity.h \
- system/monster-race-info.h \
+ system/monster-race-info.cpp system/monster-race-info.h \
system/player-type-definition.cpp system/player-type-definition.h \
+ system/redrawing-flags-updater.cpp system/redrawing-flags-updater.h \
system/system-variables.cpp system/system-variables.h \
system/terrain-type-definition.cpp system/terrain-type-definition.h \
system/gamevalue.h \
view/status-first-page.cpp view/status-first-page.h \
view/status-bars-table.cpp view/status-bars-table.h \
\
- window/display-sub-window-spells.cpp window/display-sub-window-spells.h \
window/display-sub-windows.cpp window/display-sub-windows.h \
window/main-window-left-frame.cpp window/main-window-left-frame.h \
window/main-window-row-column.cpp window/main-window-row-column.h \
cocoa_xcode_files = \
cocoa/AppDelegate.m \
- cocoa/Base.lproj/MainMenu.xib
+ cocoa/Base.lproj/MainMenu.xib \
+ cocoa/Base.lproj/SoundAndMusic.xib
cocoa_icon_files = \
cocoa/hengband_Icons.icns \
cocoa/Save.icns \
cocoa_plist_files = \
cocoa/CommandMenu.plist
cocoa_en_nib_files = \
- cocoa/Base.lproj/MainMenu.nib
+ cocoa/Base.lproj/MainMenu.nib \
+ cocoa/Base.lproj/SoundAndMusic.nib
cocoa_en_strings_files = \
cocoa/en.lproj/Localizable.strings \
cocoa/en.lproj/CommandMenu.strings \
cocoa/en.lproj/GraphicsMenu.strings
cocoa_ja_strings_files = \
cocoa/ja.lproj/MainMenu.strings \
+ cocoa/ja.lproj/SoundAndMusic.strings \
cocoa/ja.lproj/Localizable.strings \
cocoa/ja.lproj/CommandMenu.strings \
cocoa/ja.lproj/GraphicsMenu.strings
main-cocoa.mm \
system/grafmode.h \
system/grafmode.cpp \
- cocoa/AppDelegate.h
-AM_CFLAGS = -mmacosx-version-min=10.13 -Wunguarded-availability
-AM_OBJCXXFLAGS = -std=c++20 -fobjc-arc -mmacosx-version-min=10.13 -Wunguarded-availability -stdlib=libc++
-AM_CXXFLAGS = -mmacosx-version-min=10.13 -Wunguarded-availability -stdlib=libc++
-hengband_LDFLAGS = -framework cocoa $(AM_LDFLAGS)
-hengband_LINK = MACOSX_DEPLOYMENT_TARGET=10.13 $(OBJCXXLINK) $(hengband_LDFLAGS) $(LDFLAGS) -o $@
+ cocoa/AppDelegate.h \
+ cocoa/AngbandAudio.h \
+ cocoa/AngbandAudio.mm \
+ cocoa/SoundAndMusic.h \
+ cocoa/SoundAndMusic.mm
+AM_CFLAGS = -mmacosx-version-min=10.15 -Wunguarded-availability
+AM_OBJCXXFLAGS = -std=c++20 -fobjc-arc -mmacosx-version-min=10.15 -Wunguarded-availability -stdlib=libc++
+AM_CXXFLAGS = -mmacosx-version-min=10.15 -Wunguarded-availability -stdlib=libc++
+hengband_LDFLAGS = -framework cocoa -framework AVFoundation $(AM_LDFLAGS)
+hengband_LINK = MACOSX_DEPLOYMENT_TARGET=10.15 $(OBJCXXLINK) $(hengband_LDFLAGS) $(LDFLAGS) -o $@
APPNAME = $(PACKAGE_NAME)
APPEXE = hengband
APPDIR = $(APPNAME).app
hengband_LINK = $(CXXLINK)
endif
-DEFAULT_INCLUDES = -I$(srcdir) -I$(top_builddir)/src
+# The "-I$(top_builddir)/src/cocoa" is there so can use the same include
+# directives in the cocoa/*.{h,mm} files when building here or rebuilding the
+# nib files in Xcode according to the procedure in cocoa/AppDelegate.m.
+DEFAULT_INCLUDES = -I$(srcdir) -I$(top_builddir)/src -I$(top_builddir)/src/cocoa
CPPFLAGS += $(XFT_CFLAGS) $(libcurl_CFLAGS)
LIBS += $(XFT_LIBS) $(libcurl_LIBS)
COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
CXXCOMPILE += -include ../src/stdafx.h
stdafx.h.gch: stdafx.h stdafx.cpp Makefile
- $(CXX) -x c++-header $(CXXFLAGS) $(srcdir)/stdafx.cpp -o $@
+ $(CXX) -x c++-header $(CXXFLAGS) $(AM_CXXFLAGS) $(srcdir)/stdafx.cpp -o $@
if test none != "$(PCH_CHECKSUMMER)" ; then \
rm -f "$@".sum ; \
$(PCH_CHECKSUMMER) $@ > "$@".sum ; \
OSDN Git Service
