X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=6fee591d8ff18b9826298a815d6dcf2209c13470;hp=087f6dd647b5f3166e0a3392539d4835bb4a969d;hb=24dac5ccd309837c6767dcf6b145be385eea2e21;hpb=9bbd27a80f707230dfdf1f553716b1e1bfaf330a

diff --git a/src/main.cpp b/src/main.cpp
index 087f6dd6..6fee591d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,8 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,7 +19,6 @@
 */
 
 #include <iostream>
-#include <string>
 
 #include "bitboard.h"
 #include "evaluate.h"
@@ -26,27 +26,27 @@
 #include "search.h"
 #include "thread.h"
 #include "tt.h"
-#include "ucioption.h"
-
-extern void uci_loop(const std::string&);
-extern void kpk_bitbase_init();
+#include "uci.h"
+#include "syzygy/tbprobe.h"
 
 int main(int argc, char* argv[]) {
 
   std::cout << engine_info() << std::endl;
 
+  UCI::init(Options);
+  PSQT::init();
   Bitboards::init();
   Position::init();
-  kpk_bitbase_init();
+  Bitbases::init();
   Search::init();
-  Threads.init();
   Eval::init();
-  TT.set_size(Options["Hash"]);
-
-  std::string args;
+  Pawns::init();
+  Threads.init();
+  Tablebases::init(Options["SyzygyPath"]);
+  TT.resize(Options["Hash"]);
 
-  for (int i = 1; i < argc; i++)
-      args += std::string(" ") + argv[i];
+  UCI::loop(argc, argv);
 
-  uci_loop(args);
+  Threads.exit();
+  return 0;
 }