Merge remote-tracking branch 'upstream/master' into HEAD
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 11 Sep 2020 17:49:12 +0000 (19:49 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 11 Sep 2020 17:49:12 +0000 (19:49 +0200)
1  2 
src/Makefile
src/main.cpp
src/misc.cpp
src/position.cpp
src/syzygy/tbprobe.cpp
src/ucioption.cpp

diff --cc src/Makefile
@@@ -270,9 -307,9 +310,9 @@@ endi
  ifeq ($(COMP),gcc)
        comp=gcc
        CXX=g++
 -      CXXFLAGS += -pedantic -Wextra -Wshadow
 +      CXXFLAGS += -pedantic -Wextra
  
-       ifeq ($(ARCH),$(filter $(ARCH),armv7 armv8))
+       ifeq ($(arch),$(filter $(arch),armv7 armv8))
                ifeq ($(OS),Android)
                        CXXFLAGS += -m$(bits)
                        LDFLAGS += -m$(bits)
diff --cc src/main.cpp
Simple merge
diff --cc src/misc.cpp
Simple merge
Simple merge
Simple merge
@@@ -87,9 -79,8 +88,9 @@@ void init(OptionsMap& o) 
    o["SyzygyProbeDepth"]      << Option(1, 1, 100);
    o["Syzygy50MoveRule"]      << Option(true);
    o["SyzygyProbeLimit"]      << Option(7, 0, 7);
-   o["Use NNUE"]              << Option(false, on_use_NNUE);
-   o["EvalFile"]              << Option("nn-9931db908a9b.nnue", on_eval_file);
+   o["Use NNUE"]              << Option(true, on_use_NNUE);
+   o["EvalFile"]              << Option(EvalFileDefaultName, on_eval_file);
 +  o["RPCServerAddress"]      << Option("<empty>", on_rpc_server_address);
  }