diff --git a/CMakeLists.txt b/CMakeLists.txt index 71974b10dcde26db2bf38005288f11ed3d2cba00..8a8984dbde73a0cedfeb11e15080f2e25653e917 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,8 @@ set(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) # Required packages -find_package(Boost 1.58 REQUIRED COMPONENTS filesystem log serialization date_time) +find_package(Boost 1.58 REQUIRED COMPONENTS filesystem log serialization + date_time) find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) find_package(SOIL REQUIRED) diff --git a/examples/50-shadertoy/main.cpp b/examples/50-shadertoy/main.cpp index 89d5ef5264ce6bdf08823ef64b09de390097eec4..3df9e7f7e5bc570be5133c946b692548ca433d1b 100644 --- a/examples/50-shadertoy/main.cpp +++ b/examples/50-shadertoy/main.cpp @@ -228,8 +228,8 @@ int loadRemote(const string &shaderId, const string &shaderApiKey, conf.wrap = oglplus::TextureWrap::ClampToEdge; } - if (input["ctype"].asString().compare("texture") == 0 - || input["ctype"].asString().compare("cubemap") == 0) + if (input["ctype"].compare("texture") == 0 + || input["ctype"].compare("cubemap") == 0) { conf.type = "texture"; @@ -271,7 +271,7 @@ int loadRemote(const string &shaderId, const string &shaderApiKey, conf.source = dstpath.string(); } - else if (input["ctype"].asString().compare("buffer") == 0) + else if (input["ctype"].compare("buffer") == 0) { conf.type = "buffer"; conf.source = "Buf A"; @@ -288,7 +288,7 @@ int loadRemote(const string &shaderId, const string &shaderApiKey, ss << "Unsupported input " << input["ctype"].asString() << " for pass " << i << ", input " << input["channel"].asInt(); - if (!(input["ctype"].asString().compare("keyboard") == 0)) + if (!(input["ctype"].compare("keyboard") == 0)) { throw runtime_error(ss.str().c_str()); }