Merge branch 'develop' into macos-develop

[hengbandforosx/hengbandosx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8968369..4a31866 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -193,6 +193,9 @@ hengband_SOURCES = \
        effect/effect-processor.cpp effect/effect-processor.h \
        effect/effect-characteristics.h \
        \
+       external-lib/include-json.h \
+       external-lib/json.hpp \
+       \
        flavor/flag-inscriptions-table.cpp flavor/flag-inscriptions-table.h \
        flavor/flavor-describer.cpp flavor/flavor-describer.h \
        flavor/flavor-util.cpp flavor/flavor-util.h \
@@ -570,9 +573,13 @@ hengband_SOURCES = \
        mutation/mutation-processor.cpp mutation/mutation-processor.h \
        mutation/mutation-techniques.cpp mutation/mutation-techniques.h \
        \
+       net/curl-easy-session.cpp net/curl-easy-session.h \
+       net/curl-slist.cpp net/curl-slist.h \
+       net/http-client.cpp net/http-client.h \
+       net/report-error.cpp net/report-error.h \
+       \
        object/item-tester-hooker.cpp object/item-tester-hooker.h \
        object/object-broken.cpp object/object-broken.h \
-       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-hook.cpp object/object-kind-hook.h \
@@ -908,6 +915,7 @@ hengband_SOURCES = \
        system/alloc-entries.cpp system/alloc-entries.h \
        system/angband.h \
        system/angband-exceptions.h \
+       system/angband-system.h system/angband-system.cpp \
        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 \
@@ -959,14 +967,17 @@ hengband_SOURCES = \
        util/angband-files.cpp util/angband-files.h \
        util/buffer-shaper.cpp util/buffer-shaper.h \
        util/bit-flags-calculator.h \
+       util/candidate-selector.cpp util/candidate-selector.h \
        util/enum-converter.h \
        util/enum-range.h \
+       util/finalizer.h \
        util/flag-group.h \
        util/int-char-converter.h \
        util/object-sort.cpp util/object-sort.h \
        util/point-2d.h \
        util/probability-table.h \
        util/rng-xoshiro.cpp util/rng-xoshiro.h \
+       util/sha256.cpp util/sha256.h \
        util/sort.cpp util/sort.h \
        util/string-processor.cpp util/string-processor.h \
        \
@@ -1030,6 +1041,7 @@ EXTRA_hengband_SOURCES = \
        main-win/main-win-bg.cpp main-win/main-win-bg.h \
        main-win/main-win-cfg-reader.cpp main-win/main-win-cfg-reader.h \
        main-win/main-win-define.h \
+       main-win/main-win-exception.cpp main-win/main-win-exception.h \
        main-win/main-win-file-utils.cpp main-win/main-win-file-utils.h \
        main-win/main-win-mci.cpp main-win/main-win-mci.h \
        main-win/main-win-menuitem.h \
@@ -1041,6 +1053,7 @@ EXTRA_hengband_SOURCES = \
        main-win/main-win-utils.cpp main-win/main-win-utils.h \
        main-win/wav-reader.cpp main-win/wav-reader.h \
        main-cap.cpp \
+       test/test-sha256.cpp \
        wall.bmp \
        stdafx.cpp stdafx.h
 
@@ -1139,7 +1152,7 @@ endif
 # 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)
+CPPFLAGS += $(XFT_CFLAGS) $(libssl_CFLAGS) $(libcrypto_CFLAGS)
 LIBS += $(XFT_LIBS) $(libcurl_LIBS)
 COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)