From 0b5491e0a2f1a9a4023e2c4eb171287bede41388 Mon Sep 17 00:00:00 2001 From: Marc Sunet Date: Fri, 21 Nov 2025 09:41:06 -0800 Subject: Switch to plain C --- CMakeLists.txt | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index ca8b0ac..82d9df9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,18 @@ -cmake_minimum_required(VERSION 3.25) +cmake_minimum_required(VERSION 3.20) -set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) -set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1) -set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a") -set(CMAKE_CXX_SCAN_FOR_MODULES ON) +set(CMAKE_C_STANDARD 17) +set(CMAKE_C_STANDARD_REQUIRED ON) +set(CMAKE_C_EXTENSIONS OFF) # Multi-threaded statically-linked runtime library (-MT) -set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +# Debug results in a linker warning, I think because the DX12 libs are linked +# against a Release version of the runtime. +#set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded") -project(dx12) +add_compile_definitions(-D_AMD64_=1) + +project(dx12c) # External dependencies. add_subdirectory(contrib/DirectX-Headers) @@ -18,7 +20,8 @@ add_subdirectory(contrib/glfw) # Common libraries. add_subdirectory(dxg) -add_subdirectory(dxwindow) +add_subdirectory(app) # Applications. +#add_subdirectory(game) add_subdirectory(hello) -- cgit v1.2.3