Support for windows build via mingw-w64
This commit is contained in:
parent
5e49ef542b
commit
dca1cffb69
3 changed files with 31 additions and 6 deletions
13
example02_threaded_raytracing/buildWin/Makefile
Normal file
13
example02_threaded_raytracing/buildWin/Makefile
Normal file
|
@ -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
|
|
@ -5,9 +5,15 @@
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
#include <glm/ext/matrix_transform.hpp>
|
#ifdef __MINGW32__
|
||||||
#include <glm/gtc/matrix_transform.hpp>
|
# include "/usr/include/glm/ext/matrix_transform.hpp"
|
||||||
#include <glm/matrix.hpp>
|
# include "/usr/include/glm/gtc/matrix_transform.hpp"
|
||||||
|
# include "/usr/include/glm/matrix.hpp"
|
||||||
|
#else
|
||||||
|
# include <glm/ext/matrix_transform.hpp>
|
||||||
|
# include <glm/gtc/matrix_transform.hpp>
|
||||||
|
# include <glm/matrix.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
const float PI = std::acos(-1.0F);
|
const float PI = std::acos(-1.0F);
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,15 @@ constexpr float EX02_RAY_TRACER_GRAY_SPHERE_RADIUS = 1.5F;
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <glm/mat4x4.hpp>
|
#ifdef __MINGW32__
|
||||||
#include <glm/matrix.hpp>
|
# include "/usr/include/glm/mat4x4.hpp"
|
||||||
#include <glm/vec3.hpp>
|
# include "/usr/include/glm/matrix.hpp"
|
||||||
|
# include "/usr/include/glm/vec3.hpp"
|
||||||
|
#else
|
||||||
|
# include <glm/mat4x4.hpp>
|
||||||
|
# include <glm/matrix.hpp>
|
||||||
|
# include <glm/vec3.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Ex02::RT {
|
namespace Ex02::RT {
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue