Skip to content

Commit

Permalink
Update for libxayautil.
Browse files Browse the repository at this point in the history
In b5fd2360bdb67e223a96933c3068b75d7b91cdd6, libxayagame moved some
files (notably uint256) out to a new libxayautil.  This updates the
code for that refactoring.
  • Loading branch information
domob1812 committed May 5, 2019
1 parent ea44f9e commit c584a63
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -25,7 +25,7 @@ CXXFLAGS+=" -DGLOG_NO_ABBREVIATED_SEVERITIES"

PKG_PROG_PKG_CONFIG

PKG_CHECK_MODULES([XAYAGAME], [libxayagame])
PKG_CHECK_MODULES([XAYAGAME], [libxayautil libxayagame])
PKG_CHECK_MODULES([SQLITE3], [sqlite3])
PKG_CHECK_MODULES([JSON], [jsoncpp])
PKG_CHECK_MODULES([GLOG], [libglog])
Expand Down
2 changes: 1 addition & 1 deletion src/combat.hpp
Expand Up @@ -8,7 +8,7 @@
#include "mapdata/basemap.hpp"
#include "proto/combat.pb.h"

#include <xayagame/random.hpp>
#include <xayautil/random.hpp>

#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions src/combat_damage_bench.cpp
Expand Up @@ -9,8 +9,8 @@
#include "mapdata/basemap.hpp"
#include "proto/combat.pb.h"

#include <xayagame/hash.hpp>
#include <xayagame/random.hpp>
#include <xayautil/hash.hpp>
#include <xayautil/random.hpp>

#include <benchmark/benchmark.h>

Expand Down
4 changes: 2 additions & 2 deletions src/combat_target_bench.cpp
Expand Up @@ -6,8 +6,8 @@
#include "database/schema.hpp"
#include "hexagonal/coord.hpp"

#include <xayagame/hash.hpp>
#include <xayagame/random.hpp>
#include <xayautil/hash.hpp>
#include <xayautil/random.hpp>

#include <benchmark/benchmark.h>

Expand Down
4 changes: 2 additions & 2 deletions src/combat_tests.cpp
Expand Up @@ -8,8 +8,8 @@
#include "hexagonal/coord.hpp"
#include "proto/combat.pb.h"

#include <xayagame/hash.hpp>
#include <xayagame/random.hpp>
#include <xayautil/hash.hpp>
#include <xayautil/random.hpp>

#include <gtest/gtest.h>

Expand Down
2 changes: 1 addition & 1 deletion src/logic.hpp
Expand Up @@ -8,8 +8,8 @@
#include "mapdata/basemap.hpp"
#include "proto/character.pb.h"

#include <xayagame/random.hpp>
#include <xayagame/sqlitegame.hpp>
#include <xayautil/random.hpp>

#include <sqlite3.h>

Expand Down
2 changes: 1 addition & 1 deletion src/moveprocessor.hpp
Expand Up @@ -10,7 +10,7 @@
#include "database/region.hpp"
#include "mapdata/basemap.hpp"

#include <xayagame/random.hpp>
#include <xayautil/random.hpp>

#include <json/json.h>

Expand Down
2 changes: 1 addition & 1 deletion src/prospecting.hpp
Expand Up @@ -8,7 +8,7 @@
#include "database/region.hpp"
#include "mapdata/basemap.hpp"

#include <xayagame/random.hpp>
#include <xayautil/random.hpp>

namespace pxd
{
Expand Down
2 changes: 1 addition & 1 deletion src/pxrpcserver.cpp
Expand Up @@ -2,7 +2,7 @@

#include "jsonutils.hpp"

#include <xayagame/uint256.hpp>
#include <xayautil/uint256.hpp>

#include <glog/logging.h>

Expand Down
2 changes: 1 addition & 1 deletion src/spawn.hpp
Expand Up @@ -8,7 +8,7 @@
#include "database/faction.hpp"
#include "mapdata/basemap.hpp"

#include <xayagame/random.hpp>
#include <xayautil/random.hpp>

#include <string>

Expand Down
2 changes: 1 addition & 1 deletion src/testutils.cpp
@@ -1,6 +1,6 @@
#include "testutils.hpp"

#include <xayagame/hash.hpp>
#include <xayautil/hash.hpp>

namespace pxd
{
Expand Down
2 changes: 1 addition & 1 deletion src/testutils.hpp
@@ -1,7 +1,7 @@
#ifndef PXD_TESTUTILS_HPP
#define PXD_TESTUTILS_HPP

#include <xayagame/random.hpp>
#include <xayautil/random.hpp>

namespace pxd
{
Expand Down

0 comments on commit c584a63

Please sign in to comment.