Fixed issue with GUI-less compliation failing

FIXME: Make class for all the GUI stuff so that way the main.cpp can be cleaned up
and less bugs like this occur.
main
Brett 2022-11-07 17:04:39 -05:00
parent 1c11a1f9d9
commit 926f6d1391
11 changed files with 10 additions and 4 deletions

View File

@ -48,3 +48,7 @@
2 1714 1667783529037241417 CMakeFiles/Step_3.dir/src/engine/raytracing.cpp.o 66d57ca8c497053f 2 1714 1667783529037241417 CMakeFiles/Step_3.dir/src/engine/raytracing.cpp.o 66d57ca8c497053f
2 2081 1667783529405251409 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 1ece1ef4ff463d7b 2 2081 1667783529405251409 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 1ece1ef4ff463d7b
2081 2148 1667783529473253256 Step_3 f055ce2b85635598 2081 2148 1667783529473253256 Step_3 f055ce2b85635598
1 1400 1667858649624647232 CMakeFiles/Step_3.dir/src/graphics/gl/gl.cpp.o b114408b56d0322d
1 2246 1667858650468670173 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 1ece1ef4ff463d7b
1 7206 1667858655428804980 CMakeFiles/Step_3.dir/src/engine/image/image.cpp.o 194bb23af2286607
7207 7312 1667858655536807916 Step_3 f055ce2b85635598

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

View File

@ -1,3 +1,3 @@
Start testing: Nov 06 20:12 EST Start testing: Nov 07 17:04 EST
---------------------------------------------------------- ----------------------------------------------------------
End testing: Nov 06 20:12 EST End testing: Nov 07 17:04 EST

View File

@ -7,6 +7,7 @@
#include <fstream> #include <fstream>
#define STB_IMAGE_WRITE_IMPLEMENTATION #define STB_IMAGE_WRITE_IMPLEMENTATION
#include "engine/image/stb_image_write.h" #include "engine/image/stb_image_write.h"
#define STB_IMAGE_IMPLEMENTATION
#include "engine/image/stb_image.h" #include "engine/image/stb_image.h"
#define STB_IMAGE_RESIZE_IMPLEMENTATION #define STB_IMAGE_RESIZE_IMPLEMENTATION
#include "engine/image/stb_image_resize.h" #include "engine/image/stb_image_resize.h"

View File

@ -244,7 +244,9 @@ int main(int argc, char** args) {
delete(haltExecution); delete(haltExecution);
delete(haltRaytracing); delete(haltRaytracing);
delete(pauseRaytracing); delete(pauseRaytracing);
#ifdef COMPILE_GUI
deleteQuad(); deleteQuad();
#endif
for (auto& p : Raytracing::profiles) for (auto& p : Raytracing::profiles)
delete(p.second); delete(p.second);

View File

@ -5,7 +5,6 @@
#include <graphics/gl/gl.h> #include <graphics/gl/gl.h>
#include <GL/glx.h> #include <GL/glx.h>
#define STB_IMAGE_IMPLEMENTATION
#include "engine/image/stb_image.h" #include "engine/image/stb_image.h"
#ifndef USE_GLFW #ifndef USE_GLFW