From 4da0877600021ca7ae04febbf6f5e53abad2f484 Mon Sep 17 00:00:00 2001 From: Er2 Date: Tue, 7 Mar 2023 17:15:41 +0300 Subject: [PATCH] Haiku: Remove common/ dependency for freetype --- common/freetype/config/ftconfig.h | 11 ----------- common/vgui_surfacelib/FontManager.h | 2 +- vgui2/src/vgui_internal.h | 2 +- vgui2/src/vgui_key_translation.cpp | 4 ++-- vgui2/src/wscript | 1 + vgui2/vgui_controls/wscript | 3 ++- vgui2/vgui_surfacelib/BitmapFont.cpp | 4 ++-- vgui2/vgui_surfacelib/FontAmalgam.cpp | 2 +- vgui2/vgui_surfacelib/FontManager.cpp | 4 ++-- vgui2/vgui_surfacelib/Win32Font.cpp | 2 +- vgui2/vgui_surfacelib/linuxfont.cpp | 4 ++-- vgui2/vgui_surfacelib/wscript | 2 +- vguimatsurface/FontTextureCache.cpp | 2 +- vguimatsurface/FontTextureCache.h | 2 +- vguimatsurface/MatSystemSurface.cpp | 5 ++--- vguimatsurface/wscript | 2 +- 16 files changed, 21 insertions(+), 31 deletions(-) diff --git a/common/freetype/config/ftconfig.h b/common/freetype/config/ftconfig.h index 0af86f0a..5e19c414 100644 --- a/common/freetype/config/ftconfig.h +++ b/common/freetype/config/ftconfig.h @@ -3,17 +3,6 @@ #ifdef ANDROID #include -#elif defined(PLATFORM_HAIKU) -#include -# if B_HAIKU_64_BIT -# define __WORDSIZE 64 -# elif B_HAIKU_32_BIT -# define __WORDSIZE 32 -# else -# error "Unknown Haiku bit size" -# endif -#elif defined(OSX) || defined(PLATFORM_BSD) -#include #else #include #endif diff --git a/common/vgui_surfacelib/FontManager.h b/common/vgui_surfacelib/FontManager.h index b6b10b81..60b941d0 100644 --- a/common/vgui_surfacelib/FontManager.h +++ b/common/vgui_surfacelib/FontManager.h @@ -12,7 +12,7 @@ #endif #include -#include "vgui_surfacelib/FontAmalgam.h" +#include "common/vgui_surfacelib/FontAmalgam.h" #include "materialsystem/imaterialsystem.h" #include "filesystem.h" #include "vguifont.h" diff --git a/vgui2/src/vgui_internal.h b/vgui2/src/vgui_internal.h index 65d2bfb5..5e17ce62 100644 --- a/vgui2/src/vgui_internal.h +++ b/vgui2/src/vgui_internal.h @@ -15,7 +15,7 @@ #include #include "interface.h" #include "tier3/tier3.h" -#include "xbox/xboxstubs.h" +#include "common/xbox/xboxstubs.h" namespace vgui { diff --git a/vgui2/src/vgui_key_translation.cpp b/vgui2/src/vgui_key_translation.cpp index 0377a5d8..5cd44bef 100644 --- a/vgui2/src/vgui_key_translation.cpp +++ b/vgui2/src/vgui_key_translation.cpp @@ -7,12 +7,12 @@ #if defined( WIN32 ) && !defined( _X360 ) #include #include -#include "xbox/xboxstubs.h" +#include "common/xbox/xboxstubs.h" #endif #include "tier0/dbg.h" #include "vgui_key_translation.h" #if defined( _X360 ) -#include "xbox/xbox_win32stubs.h" +#include "common/xbox/xbox_win32stubs.h" #endif #ifdef POSIX #define VK_RETURN -1 diff --git a/vgui2/src/wscript b/vgui2/src/wscript index ae1edd35..8a14391e 100644 --- a/vgui2/src/wscript +++ b/vgui2/src/wscript @@ -50,6 +50,7 @@ def build(bld): includes = [ '.', + '../..', '../../public', '../../public/tier0', '../../public/tier1', diff --git a/vgui2/vgui_controls/wscript b/vgui2/vgui_controls/wscript index e940e130..5d464800 100644 --- a/vgui2/vgui_controls/wscript +++ b/vgui2/vgui_controls/wscript @@ -97,7 +97,7 @@ def build(bld): includes = [ '.', - '../../common', + '../..', '../../public', '../../public/tier0', '../../public/tier1' @@ -109,6 +109,7 @@ def build(bld): if bld.env.DEST_OS == 'win32': libs += ['SHELL32'] + includes += ['../../common'] bld.stlib( source = source, diff --git a/vgui2/vgui_surfacelib/BitmapFont.cpp b/vgui2/vgui_surfacelib/BitmapFont.cpp index b597ac47..0c2f49cd 100644 --- a/vgui2/vgui_surfacelib/BitmapFont.cpp +++ b/vgui2/vgui_surfacelib/BitmapFont.cpp @@ -15,8 +15,8 @@ #else #include #endif -#include "vgui_surfacelib/BitmapFont.h" -#include "vgui_surfacelib/FontManager.h" +#include "common/vgui_surfacelib/BitmapFont.h" +#include "common/vgui_surfacelib/FontManager.h" #include #include #include diff --git a/vgui2/vgui_surfacelib/FontAmalgam.cpp b/vgui2/vgui_surfacelib/FontAmalgam.cpp index 34010144..b9eab6cf 100644 --- a/vgui2/vgui_surfacelib/FontAmalgam.cpp +++ b/vgui2/vgui_surfacelib/FontAmalgam.cpp @@ -5,7 +5,7 @@ // $NoKeywords: $ //=============================================================================// -#include "vgui_surfacelib/FontAmalgam.h" +#include "common/vgui_surfacelib/FontAmalgam.h" #include #include #include diff --git a/vgui2/vgui_surfacelib/FontManager.cpp b/vgui2/vgui_surfacelib/FontManager.cpp index 95b325ba..ab6a50d8 100644 --- a/vgui2/vgui_surfacelib/FontManager.cpp +++ b/vgui2/vgui_surfacelib/FontManager.cpp @@ -5,8 +5,8 @@ //=====================================================================================// #include -#include "vgui_surfacelib/BitmapFont.h" -#include "vgui_surfacelib/FontManager.h" +#include "common/vgui_surfacelib/BitmapFont.h" +#include "common/vgui_surfacelib/FontManager.h" #include #include diff --git a/vgui2/vgui_surfacelib/Win32Font.cpp b/vgui2/vgui_surfacelib/Win32Font.cpp index 5ec02ac6..5bb55180 100644 --- a/vgui2/vgui_surfacelib/Win32Font.cpp +++ b/vgui2/vgui_surfacelib/Win32Font.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "vgui_surfacelib/Win32Font.h" +#include "common/vgui_surfacelib/Win32Font.h" #include #include #include diff --git a/vgui2/vgui_surfacelib/linuxfont.cpp b/vgui2/vgui_surfacelib/linuxfont.cpp index aada7b4a..c5152315 100644 --- a/vgui2/vgui_surfacelib/linuxfont.cpp +++ b/vgui2/vgui_surfacelib/linuxfont.cpp @@ -6,7 +6,7 @@ //=============================================================================// -#include "vgui_surfacelib/linuxfont.h" +#include "common/vgui_surfacelib/linuxfont.h" #include #include @@ -24,7 +24,7 @@ #include #include "materialsystem/imaterialsystem.h" -#include "vgui_surfacelib/FontManager.h" +#include "common/vgui_surfacelib/FontManager.h" #include "FontEffects.h" // memdbgon must be the last include file in a .cpp file!!! diff --git a/vgui2/vgui_surfacelib/wscript b/vgui2/vgui_surfacelib/wscript index 9916b28d..95216266 100644 --- a/vgui2/vgui_surfacelib/wscript +++ b/vgui2/vgui_surfacelib/wscript @@ -38,7 +38,7 @@ def build(bld): '../../public', '../../public/tier0', '../../public/tier1', - '../../common', + '../..', ] + bld.env.INCLUDES_FC + bld.env.INCLUDES_FT2 defines = [] diff --git a/vguimatsurface/FontTextureCache.cpp b/vguimatsurface/FontTextureCache.cpp index c0d62bfa..11f58e5e 100644 --- a/vguimatsurface/FontTextureCache.cpp +++ b/vguimatsurface/FontTextureCache.cpp @@ -18,7 +18,7 @@ #endif #include "FontTextureCache.h" #include "MatSystemSurface.h" -#include +#include "common/vgui_surfacelib/BitmapFont.h" #include #include #include "bitmap/imageformat.h" diff --git a/vguimatsurface/FontTextureCache.h b/vguimatsurface/FontTextureCache.h index 1f12e3ce..5ca2724d 100644 --- a/vguimatsurface/FontTextureCache.h +++ b/vguimatsurface/FontTextureCache.h @@ -11,7 +11,7 @@ #pragma once #endif -#include "vgui_surfacelib/FontManager.h" +#include "common/vgui_surfacelib/FontManager.h" #include "utlrbtree.h" #include #include "utlmap.h" diff --git a/vguimatsurface/MatSystemSurface.cpp b/vguimatsurface/MatSystemSurface.cpp index 800a0fb2..4563fac0 100644 --- a/vguimatsurface/MatSystemSurface.cpp +++ b/vguimatsurface/MatSystemSurface.cpp @@ -36,7 +36,6 @@ ILauncherMgr *g_pLauncherMgr = NULL; #include "Input.h" #include #include -#include "vgui_surfacelib/FontManager.h" #include "FontTextureCache.h" #include "MatSystemSurface.h" #include "inputsystem/iinputsystem.h" @@ -56,9 +55,9 @@ ILauncherMgr *g_pLauncherMgr = NULL; #include "../vgui2/src/VPanel.h" #include #if defined( _X360 ) -#include "xbox/xbox_win32stubs.h" +#include "common/xbox/xbox_win32stubs.h" #endif -#include "xbox/xboxstubs.h" +#include "common/xbox/xboxstubs.h" #include "../vgui2/src/Memorybitmap.h" #pragma warning( disable : 4706 ) diff --git a/vguimatsurface/wscript b/vguimatsurface/wscript index a76de0b2..4a4dd363 100644 --- a/vguimatsurface/wscript +++ b/vguimatsurface/wscript @@ -40,10 +40,10 @@ def build(bld): includes = [ '.', + '..', '../public', '../public/tier0', '../public/tier1', - '../common', ] defines = []