Add analyzer to build system.

Change-Id: I93da53eae42d91419cc5bb4d55e7ce87eadd2551

CMakeLists.txt

@@ -204,6 +204,16 @@ add_executable(aomenc
                $<TARGET_OBJECTS:aom_encoder_app_util>
                $<TARGET_OBJECTS:aom_encoder_stats>)
 
+if (CONFIG_ANALYZER)
+add_executable(analyzer
+               "${AOM_ROOT}/examples/analyzer.cc"
+               $<TARGET_OBJECTS:aom_common_app_util>
+               $<TARGET_OBJECTS:aom_decoder_app_util>)
+set(AOM_APP_TARGETS ${AOM_APP_TARGETS} analyzer)
+append_cxx_flag("$ENV{WX_CXXFLAGS}")
+append_exe_linker_flag("$ENV{WX_LDFLAGS}")
+endif ()
+
 add_executable(decode_to_md5
                "${AOM_ROOT}/examples/decode_to_md5.c"
                $<TARGET_OBJECTS:aom_common_app_util>

build/make/configure.sh

@@ -1148,6 +1148,10 @@ EOF
             enabled pic && add_asflags --apcs=/fpic
             enabled shared && add_cflags --shared
           fi
+          if enabled analyzer; then
+            add_cxxflags ${WX_CXXFLAGS}
+            add_extralibs ${WX_LDFLAGS}
+          fi
           ;;
       esac
       ;;

configure

@@ -362,6 +362,7 @@ CONFIG_LIST="
     size_limit
     aom_qm
     ${EXPERIMENT_LIST}
+    analyzer
 "
 CMDLINE_SELECT="
     dependency_tracking

examples.mk

@@ -62,6 +62,12 @@ ifeq ($(CONFIG_WEBM_IO),yes)
   INC_PATH-yes += $(SRC_PATH_BARE)/third_party/libwebm
 endif
 
+# TODO(tomfinegan): Figure out why add_{c,cpp}flags/add_extralibs doesn't work
+#                   for CXX examples.
+ifeq ($(CONFIG_ANALYZER),yes)
+  CXXFLAGS += ${WX_CXXFLAGS}
+  extralibs += ${WX_LDFLAGS}
+endif
 
 # List of examples to build. UTILS are tools meant for distribution
 # while EXAMPLES demonstrate specific portions of the API.
@@ -111,6 +117,17 @@ endif
 aomenc.GUID                  = 548DEC74-7A15-4B2B-AFC3-AA102E7C25C1
 aomenc.DESCRIPTION           = Full featured encoder
 
+ifeq ($(CONFIG_ANALYZER),yes)
+  EXAMPLES-$(CONFIG_DECODERS)        += analyzer.cc
+  analyzer.GUID                       = 83827a8c-e3c3-4b19-8832-0cfc206c4496
+  analyzer.SRCS                      += ivfdec.h ivfdec.c
+  analyzer.SRCS                      += av1/decoder/inspection.h
+  analyzer.SRCS                      += av1/decoder/inspection.c
+  analyzer.SRCS                      += video_reader.h video_reader.c
+  analyzer.SRCS                      += tools_common.h tools_common.c
+  analyzer.DESCRIPTION                = Bitstream analyzer
+endif
+
 ifeq ($(CONFIG_INSPECTION),yes)
 EXAMPLES-$(CONFIG_DECODERS) += inspect.c
 inspect.GUID                 = FA46A420-3356-441F-B0FD-60AA1345C181