From 71f0dbf7e596f477afc7eef235dbab4ccbf10d03 Mon Sep 17 00:00:00 2001 From: Aloshi Date: Wed, 25 Sep 2013 14:38:53 -0500 Subject: [PATCH] Revert "Merge pull request #134 from elpendor/unstable" This reverts commit 896e0f460b6438081320301aa5b76f7000274f2e, reversing changes made to 56b5127200035f4d9c4f897babd515dc94ae5e40. --- CMakeLists.txt | 2 +- src/GameData.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d781c99a..8b8fa5a96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ endif() find_package(FreeType REQUIRED) find_package(FreeImage REQUIRED) find_package(SDL2 REQUIRED) -find_package(Boost REQUIRED COMPONENTS system filesystem) +find_package(Boost REQUIRED COMPONENTS system filesystem regex) find_package(Eigen3 REQUIRED) #add ALSA for Linux diff --git a/src/GameData.cpp b/src/GameData.cpp index 28c636790..d6f11ca3e 100644 --- a/src/GameData.cpp +++ b/src/GameData.cpp @@ -1,6 +1,6 @@ #include "GameData.h" #include -#include +#include #include #include #include @@ -60,7 +60,7 @@ std::string GameData::getBaseName() const std::string GameData::getCleanName() const { - return regex_replace(mBaseName, std::regex("\\((.*)\\)|\\[(.*)\\]"), ""); + return regex_replace(mBaseName, boost::regex("\\((.*)\\)|\\[(.*)\\]"), ""); } void GameData::incTimesPlayed()