From dca1cffb6975ab6104a542861b9ac79777e4de98 Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Tue, 24 Aug 2021 20:29:40 +0900 Subject: [PATCH] Support for windows build via mingw-w64 --- example02_threaded_raytracing/buildWin/Makefile | 13 +++++++++++++ example02_threaded_raytracing/src/rayTracer.cpp | 12 +++++++++--- example02_threaded_raytracing/src/rayTracer.hpp | 12 +++++++++--- 3 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 example02_threaded_raytracing/buildWin/Makefile diff --git a/example02_threaded_raytracing/buildWin/Makefile b/example02_threaded_raytracing/buildWin/Makefile new file mode 100644 index 0000000..75ad497 --- /dev/null +++ b/example02_threaded_raytracing/buildWin/Makefile @@ -0,0 +1,13 @@ +CXX=x86_64-w64-mingw32-g++ +CXXFLAGS=-O3 -DNDEBUG + +all: Example02.exe + +Example02.exe: ../src/main.o ../src/rayTracer.o ../src/argParse.o + $(CXX) -o Example02.exe -lpthread $^ + +.PHONY: + +clean: + rm -f Example02.exe + rm -f ../src/*.o diff --git a/example02_threaded_raytracing/src/rayTracer.cpp b/example02_threaded_raytracing/src/rayTracer.cpp index 50036d0..1da58c6 100644 --- a/example02_threaded_raytracing/src/rayTracer.cpp +++ b/example02_threaded_raytracing/src/rayTracer.cpp @@ -5,9 +5,15 @@ #include #include -#include -#include -#include +#ifdef __MINGW32__ +# include "/usr/include/glm/ext/matrix_transform.hpp" +# include "/usr/include/glm/gtc/matrix_transform.hpp" +# include "/usr/include/glm/matrix.hpp" +#else +# include +# include +# include +#endif const float PI = std::acos(-1.0F); diff --git a/example02_threaded_raytracing/src/rayTracer.hpp b/example02_threaded_raytracing/src/rayTracer.hpp index 2f5307d..59018fa 100644 --- a/example02_threaded_raytracing/src/rayTracer.hpp +++ b/example02_threaded_raytracing/src/rayTracer.hpp @@ -12,9 +12,15 @@ constexpr float EX02_RAY_TRACER_GRAY_SPHERE_RADIUS = 1.5F; #include #include -#include -#include -#include +#ifdef __MINGW32__ +# include "/usr/include/glm/mat4x4.hpp" +# include "/usr/include/glm/matrix.hpp" +# include "/usr/include/glm/vec3.hpp" +#else +# include +# include +# include +#endif namespace Ex02::RT {