From 022a4bdd81332ce67d799be6a06afb42ae45ac2e Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Mon, 25 Dec 2017 12:27:32 +0000 Subject: [Build] Added examples and improved build for them. --- examples/CMakeLists.txt | 12 ++++++++++-- examples/shooter/main.cpp | 22 ++++++++++++++++++++++ yage/core/glslprogram.cpp | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 examples/shooter/main.cpp diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 16b20795..a75f6528 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,2 +1,10 @@ -add_executable(simplegame simplegame/main.cpp) -target_link_libraries(simplegame yage) +function(make_example name) + + file(GLOB SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${name}/*.cpp) + add_executable(${name} ${SOURCES}) + target_link_libraries(${name} yage) + +endfunction(make_test) + +make_example(simplegame) +make_example(shooter) diff --git a/examples/shooter/main.cpp b/examples/shooter/main.cpp new file mode 100644 index 00000000..d28af83e --- /dev/null +++ b/examples/shooter/main.cpp @@ -0,0 +1,22 @@ +#include + +#include + +using std::cout; + +int main(int argc, char** argv) +{ + cout << "Starting Shooter example...\n"; + + yage::Window window; + window.create("Shooter example", 1920, 1080); + + while(!window.shouldClose()) { + window.pollEvents(); + window.clearBuffer(); + + + + window.swapBuffer(); + } +} diff --git a/yage/core/glslprogram.cpp b/yage/core/glslprogram.cpp index c47de808..13abbba3 100644 --- a/yage/core/glslprogram.cpp +++ b/yage/core/glslprogram.cpp @@ -142,7 +142,7 @@ void GlslProgram::linkShaders() std::string error_log_str((const char *)&error_log[0]); - throw std::runtime_error("Could not link program : " + error_log_str); + throw std::runtime_error("Could not link program: " + error_log_str); } // detach shaders after successful link -- cgit