Use C++ modules

4 files changed, 39 insertions, 27 deletions

diff --git a/dxcommon/CMakeLists.txt b/dxcommon/CMakeLists.txt
index 08fa178..dfb52bf 100644
--- a/dxcommon/CMakeLists.txt
+++ b/dxcommon/CMakeLists.txt
@@ -1,10 +1,18 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.25)
 
-add_library(dxcommon
-    src/dxcommon.cc)
+project(dxcommon)
+
+add_library(dxcommon)
+
+target_sources(dxcommon PUBLIC
+    dxcommon.h)
+
+target_sources(dxcommon PUBLIC
+    FILE_SET cxx_modules TYPE CXX_MODULES FILES
+    dxcommon.ixx)
 
 target_include_directories(dxcommon PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/include)
+    .)
 
 target_link_libraries(dxcommon PUBLIC
     DirectX-Headers
diff --git a/dxcommon/dxcommon.h b/dxcommon/dxcommon.h
new file mode 100644
index 0000000..addb8c3
--- /dev/null
+++ b/dxcommon/dxcommon.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <d3d12.h>
+#include <dxgi1_4.h>
+#include <directx/d3dx12.h>
+
+#define THROW(error) throw exception(error, __FILE__, __LINE__)
+
+#define ThrowIfFailed(result) \
+{\
+    if (result != S_OK) \
+    {\
+        THROW(result);\
+    }\
+}
+
+//#define IID_PPV_ARGS(ppType) __uuidof(**(ppType)), static_cast<void**>(ppType)
diff --git a/dxcommon/include/dxcommon.h b/dxcommon/dxcommon.ixx
index 35ec0e2..b06ae95 100644
--- a/dxcommon/include/dxcommon.h
+++ b/dxcommon/dxcommon.ixx
@@ -1,14 +1,15 @@
-#pragma once
+module;
 
 #include <wrl.h>
-
 #include <stdexcept>
 
-//#define IID_PPV_ARGS(ppType) __uuidof(**(ppType)), static_cast<void**>(ppType)
+export module dxcommon;
+
+using Microsoft::WRL::ComPtr;
 
 namespace dx {
 
-using Microsoft::WRL::ComPtr;
+export {
 
 class exception : public std::exception
 {
@@ -35,16 +36,6 @@ private:
     static thread_local char m_error[1024];
 };
 
-#define THROW(error) throw exception(error, __FILE__, __LINE__)
-
-#define ThrowIfFailed(result) \
-{\
-    if (result != S_OK) \
-    {\
-        THROW(result);\
-    }\
-}
-
 template <typename T>
 void SafeRelease(ComPtr<T>& ptr)
 {
@@ -55,4 +46,8 @@ void SafeRelease(ComPtr<T>& ptr)
     }
 }
 
-}  // dx
+} // export
+
+thread_local char exception::m_error[1024];
+
+} // dx
diff --git a/dxcommon/src/dxcommon.cc b/dxcommon/src/dxcommon.cc
deleted file mode 100644
index 2139136..0000000
--- a/dxcommon/src/dxcommon.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "dxcommon.h"
-
-namespace dx
-{
-
-thread_local char exception::m_error[1024];
-
-}  // namespace dx