From 4c7e4ae43566d08f1d7d91bffff4646ce287a68a Mon Sep 17 00:00:00 2001
From: ladevieq <ladevie.quentin@gmail.com>
Date: Wed, 13 Jan 2021 22:20:01 +0100
Subject: Compile on windows

---
 include/rt.hpp            | 11 +++++++++--
 include/utils.hpp         |  5 +++--
 include/vk-renderer.hpp   |  5 +----
 include/vulkan-loader.hpp |  4 ++--
 include/window.hpp        | 23 +++++++++++++++++++++++
 5 files changed, 38 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/rt.hpp b/include/rt.hpp
index 222fe3a..c7fa9a0 100644
--- a/include/rt.hpp
+++ b/include/rt.hpp
@@ -1,6 +1,15 @@
 #ifndef __RT_HPP_
 #define __RT_HPP_
 
+#if defined(__linux__)
+#define LINUX
+#include <unistd.h>
+#include <dlfcn.h>
+#elif defined(_WIN32) || defined(_WIN64)
+#define WINDOWS
+#include <Windows.h>
+#endif
+
 #include "utils.hpp"
 #include "vec3.hpp"
 #include "color.hpp"
@@ -8,8 +17,6 @@
 #include "camera.hpp"
 #include "material.hpp"
 
-#ifdef __linux__
 #include "window.hpp"
-#endif
 
 #endif // !__RT_HPP_
diff --git a/include/utils.hpp b/include/utils.hpp
index 0bef213..42a5a1a 100644
--- a/include/utils.hpp
+++ b/include/utils.hpp
@@ -5,13 +5,14 @@
 
 #include <vector>
 
-#include <cmath>
 #include <cstdlib>
 
 std::vector<uint8_t> get_shader_code(const char* path);
 
+#define PI 3.14159265359
+
 inline float deg_to_rad(float deg) {
-    return deg * M_PI / 180.0;
+    return deg * PI / 180.0;
 }
 
 inline float randd() {
diff --git a/include/vk-renderer.hpp b/include/vk-renderer.hpp
index d987d6f..aecda0f 100644
--- a/include/vk-renderer.hpp
+++ b/include/vk-renderer.hpp
@@ -6,10 +6,7 @@
 #include "vulkan-loader.hpp"
 #include "thirdparty/vk_mem_alloc.h"
 
-#include "vec3.hpp"
-#include "camera.hpp"
-#include "sphere.hpp"
-#include "window.hpp"
+#include "rt.hpp"
 
 struct input_data {
     color sky_color;
diff --git a/include/vulkan-loader.hpp b/include/vulkan-loader.hpp
index 0243c9f..cafd5bc 100644
--- a/include/vulkan-loader.hpp
+++ b/include/vulkan-loader.hpp
@@ -1,12 +1,12 @@
 #ifndef __VULKAN_LOADER_HPP_
 #define __VULKAN_LOADER_HPP_
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(WINDOWS)
 #include <Windows.h>
 #include <windowsx.h>
 
 #define VK_USE_PLATFORM_WIN32_KHR
-#elif defined(__linux__)
+#elif defined(LINUX)
 #define VK_USE_PLATFORM_XCB_KHR
 #endif
 
diff --git a/include/window.hpp b/include/window.hpp
index 8ddb58d..4b3d37b 100644
--- a/include/window.hpp
+++ b/include/window.hpp
@@ -1,6 +1,18 @@
 #ifndef __WINDOW_HPP_
 #define __WINDOW_HPP_
 
+#include <cstdint>
+
+#if defined(__linux__)
+#define LINUX
+#include <unistd.h>
+#include <dlfcn.h>
+#elif defined(_WIN32) || defined(_WIN64)
+#define WINDOWS
+#include <Windows.h>
+#endif
+
+#if defined(LINUX)
 #include <xcb/xcb.h>
 
 class window {
@@ -13,5 +25,16 @@ class window {
         uint32_t            width;
         uint32_t            height;
 };
+#elif defined(WINDOWS)
+#include <Windows.h>
+
+class window {
+    public:
+        window(uint32_t width, uint32_t height);
+
+        uint32_t            width;
+        uint32_t            height;
+};
+#endif
 
 #endif // !__WINDOW_HPP_
-- 
cgit v1.3