Skip to content

Commit 4da0877

Browse files
er2offer2off
committed
Haiku: Remove common/ dependency for freetype
1 parent 2305298 commit 4da0877

16 files changed

+21
-31
lines changed

‎common/freetype/config/ftconfig.h

-11
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,6 @@
33

44
#ifdef ANDROID
55
#include <sys/cdefs.h>
6-
#elif defined(PLATFORM_HAIKU)
7-
#include <BeBuild.h>
8-
# if B_HAIKU_64_BIT
9-
# define __WORDSIZE 64
10-
# elif B_HAIKU_32_BIT
11-
# define __WORDSIZE 32
12-
# else
13-
# error "Unknown Haiku bit size"
14-
# endif
15-
#elif defined(OSX) || defined(PLATFORM_BSD)
16-
#include <stdint.h>
176
#else
187
#include <bits/wordsize.h>
198
#endif

‎common/vgui_surfacelib/FontManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#endif
1313

1414
#include <vgui/VGUI.h>
15-
#include "vgui_surfacelib/FontAmalgam.h"
15+
#include "common/vgui_surfacelib/FontAmalgam.h"
1616
#include "materialsystem/imaterialsystem.h"
1717
#include "filesystem.h"
1818
#include "vguifont.h"

‎vgui2/src/vgui_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <vgui/VGUI.h>
1616
#include "interface.h"
1717
#include "tier3/tier3.h"
18-
#include "xbox/xboxstubs.h"
18+
#include "common/xbox/xboxstubs.h"
1919

2020
namespace vgui
2121
{

‎vgui2/src/vgui_key_translation.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#if defined( WIN32 ) && !defined( _X360 )
88
#include <wtypes.h>
99
#include <winuser.h>
10-
#include "xbox/xboxstubs.h"
10+
#include "common/xbox/xboxstubs.h"
1111
#endif
1212
#include "tier0/dbg.h"
1313
#include "vgui_key_translation.h"
1414
#if defined( _X360 )
15-
#include "xbox/xbox_win32stubs.h"
15+
#include "common/xbox/xbox_win32stubs.h"
1616
#endif
1717
#ifdef POSIX
1818
#define VK_RETURN -1

‎vgui2/src/wscript

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def build(bld):
5050

5151
includes = [
5252
'.',
53+
'../..',
5354
'../../public',
5455
'../../public/tier0',
5556
'../../public/tier1',

‎vgui2/vgui_controls/wscript

+2-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def build(bld):
9797

9898
includes = [
9999
'.',
100-
'../../common',
100+
'../..',
101101
'../../public',
102102
'../../public/tier0',
103103
'../../public/tier1'
@@ -109,6 +109,7 @@ def build(bld):
109109

110110
if bld.env.DEST_OS == 'win32':
111111
libs += ['SHELL32']
112+
includes += ['../../common']
112113

113114
bld.stlib(
114115
source = source,

‎vgui2/vgui_surfacelib/BitmapFont.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#else
1616
#include <malloc.h>
1717
#endif
18-
#include "vgui_surfacelib/BitmapFont.h"
19-
#include "vgui_surfacelib/FontManager.h"
18+
#include "common/vgui_surfacelib/BitmapFont.h"
19+
#include "common/vgui_surfacelib/FontManager.h"
2020
#include <tier0/dbg.h>
2121
#include <vgui/ISurface.h>
2222
#include <tier0/mem.h>

‎vgui2/vgui_surfacelib/FontAmalgam.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// $NoKeywords: $
66
//=============================================================================//
77

8-
#include "vgui_surfacelib/FontAmalgam.h"
8+
#include "common/vgui_surfacelib/FontAmalgam.h"
99
#include <tier0/dbg.h>
1010
#include <vgui/VGUI.h>
1111
#include <vgui/ISurface.h>

‎vgui2/vgui_surfacelib/FontManager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
//=====================================================================================//
66

77
#include <locale.h>
8-
#include "vgui_surfacelib/BitmapFont.h"
9-
#include "vgui_surfacelib/FontManager.h"
8+
#include "common/vgui_surfacelib/BitmapFont.h"
9+
#include "common/vgui_surfacelib/FontManager.h"
1010
#include <vgui/ISurface.h>
1111
#include <tier0/dbg.h>
1212

‎vgui2/vgui_surfacelib/Win32Font.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <string.h>
1212
#include <math.h>
1313
#include <malloc.h>
14-
#include "vgui_surfacelib/Win32Font.h"
14+
#include "common/vgui_surfacelib/Win32Font.h"
1515
#include <tier0/dbg.h>
1616
#include <vgui/ISurface.h>
1717
#include <tier0/mem.h>

‎vgui2/vgui_surfacelib/linuxfont.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//=============================================================================//
77

88

9-
#include "vgui_surfacelib/linuxfont.h"
9+
#include "common/vgui_surfacelib/linuxfont.h"
1010

1111
#include <assert.h>
1212
#include <stdio.h>
@@ -24,7 +24,7 @@
2424
#include <freetype/ftbitmap.h>
2525
#include "materialsystem/imaterialsystem.h"
2626

27-
#include "vgui_surfacelib/FontManager.h"
27+
#include "common/vgui_surfacelib/FontManager.h"
2828
#include "FontEffects.h"
2929

3030
// memdbgon must be the last include file in a .cpp file!!!

‎vgui2/vgui_surfacelib/wscript

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def build(bld):
3838
'../../public',
3939
'../../public/tier0',
4040
'../../public/tier1',
41-
'../../common',
41+
'../..',
4242
] + bld.env.INCLUDES_FC + bld.env.INCLUDES_FT2
4343

4444
defines = []

‎vguimatsurface/FontTextureCache.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#endif
1919
#include "FontTextureCache.h"
2020
#include "MatSystemSurface.h"
21-
#include <vgui_surfacelib/BitmapFont.h>
21+
#include "common/vgui_surfacelib/BitmapFont.h"
2222
#include <vgui/IVGui.h>
2323
#include <vgui_controls/Controls.h>
2424
#include "bitmap/imageformat.h"

‎vguimatsurface/FontTextureCache.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#pragma once
1212
#endif
1313

14-
#include "vgui_surfacelib/FontManager.h"
14+
#include "common/vgui_surfacelib/FontManager.h"
1515
#include "utlrbtree.h"
1616
#include <vgui/ISurface.h>
1717
#include "utlmap.h"

‎vguimatsurface/MatSystemSurface.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ ILauncherMgr *g_pLauncherMgr = NULL;
3636
#include "Input.h"
3737
#include <vgui/IHTML.h>
3838
#include <vgui/IVGui.h>
39-
#include "vgui_surfacelib/FontManager.h"
4039
#include "FontTextureCache.h"
4140
#include "MatSystemSurface.h"
4241
#include "inputsystem/iinputsystem.h"
@@ -56,9 +55,9 @@ ILauncherMgr *g_pLauncherMgr = NULL;
5655
#include "../vgui2/src/VPanel.h"
5756
#include <vgui/IInputInternal.h>
5857
#if defined( _X360 )
59-
#include "xbox/xbox_win32stubs.h"
58+
#include "common/xbox/xbox_win32stubs.h"
6059
#endif
61-
#include "xbox/xboxstubs.h"
60+
#include "common/xbox/xboxstubs.h"
6261
#include "../vgui2/src/Memorybitmap.h"
6362

6463
#pragma warning( disable : 4706 )

‎vguimatsurface/wscript

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ def build(bld):
4040

4141
includes = [
4242
'.',
43+
'..',
4344
'../public',
4445
'../public/tier0',
4546
'../public/tier1',
46-
'../common',
4747
]
4848

4949
defines = []

0 commit comments

Comments
 (0)