From ebc19ded62ef08b24f93cfa03e896907eb776d1d Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Sat, 1 Jun 2024 18:21:29 -0700 Subject: [PATCH] font provider dwrite c++ -> c --- ...provider_dwrite.cpp => font_provider_dwrite.c} | 0 .../dwrite/font_provider_dwrite_main.cpp | 15 --------------- src/font_provider/font_provider_inc.c | 10 ++++------ src/font_provider/font_provider_inc.h | 10 ++++------ 4 files changed, 8 insertions(+), 27 deletions(-) rename src/font_provider/dwrite/{font_provider_dwrite.cpp => font_provider_dwrite.c} (100%) delete mode 100644 src/font_provider/dwrite/font_provider_dwrite_main.cpp diff --git a/src/font_provider/dwrite/font_provider_dwrite.cpp b/src/font_provider/dwrite/font_provider_dwrite.c similarity index 100% rename from src/font_provider/dwrite/font_provider_dwrite.cpp rename to src/font_provider/dwrite/font_provider_dwrite.c diff --git a/src/font_provider/dwrite/font_provider_dwrite_main.cpp b/src/font_provider/dwrite/font_provider_dwrite_main.cpp deleted file mode 100644 index 1f5d20b5..00000000 --- a/src/font_provider/dwrite/font_provider_dwrite_main.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) 2024 Epic Games Tools -// Licensed under the MIT license (https://opensource.org/license/mit/) - -#define BUILD_SUPPLEMENTARY_UNIT 1 - -#include "base/base_inc.h" -#include "os/os_inc.h" -#include "font_provider/font_provider.h" - -#include "font_provider_dwrite.h" -#include "font_provider_dwrite.cpp" - -#include "base/base_inc.c" -#include "os/os_inc.c" -#include "font_provider/font_provider.c" diff --git a/src/font_provider/font_provider_inc.c b/src/font_provider/font_provider_inc.c index 92f0554c..f2dc49ae 100644 --- a/src/font_provider/font_provider_inc.c +++ b/src/font_provider/font_provider_inc.c @@ -3,10 +3,8 @@ #include "font_provider.c" -#if LANG_CPP -# if FP_BACKEND == FP_BACKEND_DWRITE -# include "dwrite/font_provider_dwrite.cpp" -# else -# error Font provider backend not specified. -# endif +#if FP_BACKEND == FP_BACKEND_DWRITE +# include "dwrite/font_provider_dwrite.c" +#else +# error Font provider backend not specified. #endif diff --git a/src/font_provider/font_provider_inc.h b/src/font_provider/font_provider_inc.h index 3abf829e..a79c66fc 100644 --- a/src/font_provider/font_provider_inc.h +++ b/src/font_provider/font_provider_inc.h @@ -24,12 +24,10 @@ //////////////////////////////// //~ rjf: Backend Includes -#if LANG_CPP -# if FP_BACKEND == FP_BACKEND_DWRITE -# include "dwrite/font_provider_dwrite.h" -# else -# error Font provider backend not specified. -# endif +#if FP_BACKEND == FP_BACKEND_DWRITE +# include "dwrite/font_provider_dwrite.h" +#else +# error Font provider backend not specified. #endif #endif // FONT_PROVIDER_INC_H