aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--dxcommon/CMakeLists.txt20
-rw-r--r--dxg/CMakeLists.txt20
-rw-r--r--dxg/dxcommon.h (renamed from dxcommon/dxcommon.h)0
-rw-r--r--dxg/dxcommon.ixx (renamed from dxcommon/dxcommon.ixx)0
-rw-r--r--hello/CMakeLists.txt2
6 files changed, 22 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 631e1e3..ca8b0ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ add_subdirectory(contrib/DirectX-Headers)
17add_subdirectory(contrib/glfw) 17add_subdirectory(contrib/glfw)
18 18
19# Common libraries. 19# Common libraries.
20add_subdirectory(dxcommon) 20add_subdirectory(dxg)
21add_subdirectory(dxwindow) 21add_subdirectory(dxwindow)
22 22
23# Applications. 23# Applications.
diff --git a/dxcommon/CMakeLists.txt b/dxcommon/CMakeLists.txt
deleted file mode 100644
index dfb52bf..0000000
--- a/dxcommon/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
1cmake_minimum_required(VERSION 3.25)
2
3project(dxcommon)
4
5add_library(dxcommon)
6
7target_sources(dxcommon PUBLIC
8 dxcommon.h)
9
10target_sources(dxcommon PUBLIC
11 FILE_SET cxx_modules TYPE CXX_MODULES FILES
12 dxcommon.ixx)
13
14target_include_directories(dxcommon PUBLIC
15 .)
16
17target_link_libraries(dxcommon PUBLIC
18 DirectX-Headers
19 D3D12.lib
20 DXGI.lib)
diff --git a/dxg/CMakeLists.txt b/dxg/CMakeLists.txt
new file mode 100644
index 0000000..6fa5401
--- /dev/null
+++ b/dxg/CMakeLists.txt
@@ -0,0 +1,20 @@
1cmake_minimum_required(VERSION 3.25)
2
3project(dxg)
4
5add_library(dxg)
6
7target_sources(dxg PUBLIC
8 dxcommon.h)
9
10target_sources(dxg PUBLIC
11 FILE_SET cxx_modules TYPE CXX_MODULES FILES
12 dxcommon.ixx)
13
14target_include_directories(dxg PUBLIC
15 .)
16
17target_link_libraries(dxg PUBLIC
18 DirectX-Headers
19 D3D12.lib
20 DXGI.lib)
diff --git a/dxcommon/dxcommon.h b/dxg/dxcommon.h
index addb8c3..addb8c3 100644
--- a/dxcommon/dxcommon.h
+++ b/dxg/dxcommon.h
diff --git a/dxcommon/dxcommon.ixx b/dxg/dxcommon.ixx
index b06ae95..b06ae95 100644
--- a/dxcommon/dxcommon.ixx
+++ b/dxg/dxcommon.ixx
diff --git a/hello/CMakeLists.txt b/hello/CMakeLists.txt
index ac9f285..2804b24 100644
--- a/hello/CMakeLists.txt
+++ b/hello/CMakeLists.txt
@@ -6,5 +6,5 @@ add_executable(hello
6 main.cc) 6 main.cc)
7 7
8target_link_libraries(hello PRIVATE 8target_link_libraries(hello PRIVATE
9 dxcommon 9 dxg
10 dxwindow) 10 dxwindow)