...
 
Commits (5)
......@@ -26,6 +26,7 @@ include(GNUInstallDirs)
find_package(Threads REQUIRED)
find_package(PkgConfig REQUIRED)
set(OpenGL_GL_PREFERENCE "LEGACY")
find_package(OpenGL REQUIRED)
find_package(Boost COMPONENTS REQUIRED)
pkg_search_module(SDL2 REQUIRED sdl2)
......@@ -120,6 +121,7 @@ set_target_properties(libpingus PROPERTIES OUTPUT_NAME pingus)
target_include_directories(libpingus PUBLIC
${SDL2_INCLUDE_DIRS}
${SDL2IMAGE_INCLUDE_DIRS}
${SDL2MIXER_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS})
target_compile_definitions(libpingus PUBLIC -DVERSION="${GIT_REPO_VERSION}")
target_link_libraries(libpingus PUBLIC
......
;; Pingus - A free Lemmings clone
;; Copyright (C) 2019 Ingo Ruhnke <[email protected]>
;;
;; This program is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;;
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(use-modules (guix build-system cmake)
(guix gexp)
(guix git-download)
(guix licenses)
(guix packages)
(gnu packages audio)
(gnu packages boost)
(gnu packages freedesktop)
(gnu packages game-development)
(gnu packages gcc)
(gnu packages gl)
(gnu packages glib)
(gnu packages image)
(gnu packages pkg-config)
(gnu packages python-xyz)
(gnu packages sdl)
(gnu packages serialization))
(define %source-dir (dirname (current-filename)))
(define (source-predicate . dirs)
(let ((preds (map (lambda (p)
(git-predicate (string-append %source-dir p)))
dirs)))
(lambda (file stat)
(let loop ((f (car preds))
(rest (cdr preds)))
(if (f file stat)
#t
(if (not (nil? rest))
(loop (car rest) (cdr rest))
#f))))))
(define-public pingus
(package
(name "pingus")
(version "0.8.0")
(source (local-file %source-dir
#:recursive? #t
#:select? (source-predicate ""
"/external/googletest"
"/external/logmich"
"/external/sexp-cpp"
"/external/tinygettext"
"/external/uitest"
"/external/xdg"
)))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; network access needed for URL checks
#:configure-flags (list "-DBUILD_TESTS=ON"
"-DBUILD_EXTRA=ON")))
(native-inputs `(("pkg-config" ,pkg-config)
("desktop-file-utils" ,desktop-file-utils)
("appstream-glib" ,appstream-glib)
("gcc-9" ,gcc-9))) ; needed for <filesystem>
(propagated-inputs
`(("libmodplug" ,libmodplug))) ; FIXME: needed for sound, but not found by SDL_Mixer
(inputs `(("sdl2" ,sdl)
("sdl2-image" ,sdl2-image)
("sdl2-mixer" ,sdl2-mixer)
("mesa" ,mesa)
("glu" ,glu)
("libpng" ,libpng)
("jsoncpp" ,jsoncpp)
("boost" ,boost)))
(synopsis "Guide groups of penguins through various obstacles")
(description "A 2d side scrolling puzzle game where you guide large
groups of little penguins through various obstacles and dangers using
their numerous talents.
A level editor is included to allow building your own levels and
numerous user contributed levels are included as well.
The game is heavily inspired by the classic Lemmings.")
(home-page "https://pingus.seul.org")
(license gpl3+)))
pingus
;; EOF ;;
......@@ -241,14 +241,17 @@ JsonWriterImpl::flush()
std::stringstream out;
if (false)
{
Json::StyledStreamWriter writer(" ");
writer.write(out, m_stack.back());
Json::StreamWriterBuilder builder;
builder["indentation"] = " ";
std::unique_ptr<Json::StreamWriter> writer(builder.newStreamWriter());
writer->write(m_stack.back(), &out);
strip_trailing_whitespace(m_out, out);
}
else
{
Json::FastWriter writer;
m_out << writer.write(m_stack.back());
Json::StreamWriterBuilder builder;
std::unique_ptr<Json::StreamWriter> writer(builder.newStreamWriter());
writer->write(m_stack.back(), &m_out);
}
}
......
......@@ -315,15 +315,16 @@ Reader::parse(std::istream& stream)
stream.unget();
if (c == '{')
{
Json::Reader reader;
Json::CharReaderBuilder builder;
std::string errs;
Json::Value root;
if (reader.parse(stream, root))
if (Json::parseFromStream(builder, stream, &root, &errs))
{
return ReaderObject(std::make_shared<JsonReaderObjectImpl>(root));
}
else
{
log_error("json parse error: %1%", reader.getFormattedErrorMessages());
log_error("json parse error: %1%", errs);
return ReaderObject();
}
}
......