diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 66374c7..19ec9dc 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -22,6 +22,7 @@ "-lm", "-ldl", "-pipe", + "-Wno-volatile", "-O0" ], "options": { @@ -58,6 +59,7 @@ "-lm", "-ldl", "-pipe", + "-Wno-volatile", "-O0" ], "options": { diff --git a/breakout/breakout b/breakout/breakout old mode 100644 new mode 100755 index b018e43..e5f30a7 Binary files a/breakout/breakout and b/breakout/breakout differ diff --git a/breakout/resourceManager.cpp b/breakout/resourceManager.cpp index 5164dfc..a6f463e 100644 --- a/breakout/resourceManager.cpp +++ b/breakout/resourceManager.cpp @@ -8,8 +8,7 @@ #include #include #include - -#include "../dependencies/include/stb_image.h" +#include "./stb_image.h" // Instantiate static variables std::map ResourceManager::Textures; @@ -79,7 +78,7 @@ Shader ResourceManager::loadShaderFromFile(const char *vShaderFile, const char * geometryCode = gShaderStream.str(); } } - catch (std::exception e) + catch (std::exception const&) { std::cout << "ERROR::SHADER: Failed to read shader files" << std::endl; } diff --git a/breakout/resourceManager.hpp b/breakout/resourceManager.hpp index 7f52dfd..cb949f2 100644 --- a/breakout/resourceManager.hpp +++ b/breakout/resourceManager.hpp @@ -8,7 +8,6 @@ ** Creative Commons, either version 4 of the License, or (at your ** option) any later version. ******************************************************************/ -#ifndef BREAKOUT_RESOURCE_MANAGER_HPP_ #define BREAKOUT_RESOURCE_MANAGER_HPP_ #include @@ -49,5 +48,3 @@ private: // loads a single texture from file static Texture2D loadTextureFromFile(const char *file, bool alpha); }; - -#endif // BREAKOUT_RESOURCE_MANAGER_HPP_ \ No newline at end of file diff --git a/dependencies/include/stb_image.h b/breakout/stb_image.h similarity index 100% rename from dependencies/include/stb_image.h rename to breakout/stb_image.h diff --git a/dependencies/include/stb_images_implementation.cpp b/breakout/stb_images_implementation.cpp similarity index 100% rename from dependencies/include/stb_images_implementation.cpp rename to breakout/stb_images_implementation.cpp