d4708
/
source-engine
mirror of https://github.com/nillerusr/source-engine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Haiku: Remove common/ dependency for freetype

pull/193/head
Er2 2 years ago
parent
2305298f10
commit
4da0877600
16 changed files with 21 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      common/freetype/config/ftconfig.h
  2. 2
      common/vgui_surfacelib/FontManager.h
  3. 2
      vgui2/src/vgui_internal.h
  4. 4
      vgui2/src/vgui_key_translation.cpp
  5. 1
      vgui2/src/wscript
  6. 3
      vgui2/vgui_controls/wscript
  7. 4
      vgui2/vgui_surfacelib/BitmapFont.cpp
  8. 2
      vgui2/vgui_surfacelib/FontAmalgam.cpp
  9. 4
      vgui2/vgui_surfacelib/FontManager.cpp
  10. 2
      vgui2/vgui_surfacelib/Win32Font.cpp
  11. 4
      vgui2/vgui_surfacelib/linuxfont.cpp
  12. 2
      vgui2/vgui_surfacelib/wscript
  13. 2
      vguimatsurface/FontTextureCache.cpp
  14. 2
      vguimatsurface/FontTextureCache.h
  15. 5
      vguimatsurface/MatSystemSurface.cpp
  16. 2
      vguimatsurface/wscript

11
common/freetype/config/ftconfig.h
Unescape View File

@ -3,17 +3,6 @@
#ifdef ANDROID #ifdef ANDROID
#include <sys/cdefs.h> #include <sys/cdefs.h>
#elif defined(PLATFORM_HAIKU)
#include <BeBuild.h>
# 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 <stdint.h>
#else #else
#include <bits/wordsize.h> #include <bits/wordsize.h>
#endif #endif

2
common/vgui_surfacelib/FontManager.h
Unescape View File

@ -12,7 +12,7 @@
#endif #endif
#include <vgui/VGUI.h> #include <vgui/VGUI.h>
#include "vgui_surfacelib/FontAmalgam.h" #include "common/vgui_surfacelib/FontAmalgam.h"
#include "materialsystem/imaterialsystem.h" #include "materialsystem/imaterialsystem.h"
#include "filesystem.h" #include "filesystem.h"
#include "vguifont.h" #include "vguifont.h"

2
vgui2/src/vgui_internal.h
Unescape View File

@ -15,7 +15,7 @@
#include <vgui/VGUI.h> #include <vgui/VGUI.h>
#include "interface.h" #include "interface.h"
#include "tier3/tier3.h" #include "tier3/tier3.h"
#include "xbox/xboxstubs.h" #include "common/xbox/xboxstubs.h"
namespace vgui namespace vgui
{ {

4
vgui2/src/vgui_key_translation.cpp
Unescape View File

@ -7,12 +7,12 @@
#if defined( WIN32 ) && !defined( _X360 ) #if defined( WIN32 ) && !defined( _X360 )
#include <wtypes.h> #include <wtypes.h>
#include <winuser.h> #include <winuser.h>
#include "xbox/xboxstubs.h" #include "common/xbox/xboxstubs.h"
#endif #endif
#include "tier0/dbg.h" #include "tier0/dbg.h"
#include "vgui_key_translation.h" #include "vgui_key_translation.h"
#if defined( _X360 ) #if defined( _X360 )
#include "xbox/xbox_win32stubs.h" #include "common/xbox/xbox_win32stubs.h"
#endif #endif
#ifdef POSIX #ifdef POSIX
#define VK_RETURN -1 #define VK_RETURN -1

1
vgui2/src/wscript
Unescape View File

@ -50,6 +50,7 @@ def build(bld):
includes = [ includes = [
'.', '.',
'../..',
'../../public', '../../public',
'../../public/tier0', '../../public/tier0',
'../../public/tier1', '../../public/tier1',

3
vgui2/vgui_controls/wscript
Unescape View File

@ -97,7 +97,7 @@ def build(bld):
includes = [ includes = [
'.', '.',
'../../common', '../..',
'../../public', '../../public',
'../../public/tier0', '../../public/tier0',
'../../public/tier1' '../../public/tier1'
@ -109,6 +109,7 @@ def build(bld):
if bld.env.DEST_OS == 'win32': if bld.env.DEST_OS == 'win32':
libs += ['SHELL32'] libs += ['SHELL32']
includes += ['../../common']
bld.stlib( bld.stlib(
source = source, source = source,

4
vgui2/vgui_surfacelib/BitmapFont.cpp
Unescape View File

@ -15,8 +15,8 @@
#else #else
#include <malloc.h> #include <malloc.h>
#endif #endif
#include "vgui_surfacelib/BitmapFont.h" #include "common/vgui_surfacelib/BitmapFont.h"
#include "vgui_surfacelib/FontManager.h" #include "common/vgui_surfacelib/FontManager.h"
#include <tier0/dbg.h> #include <tier0/dbg.h>
#include <vgui/ISurface.h> #include <vgui/ISurface.h>
#include <tier0/mem.h> #include <tier0/mem.h>

2
vgui2/vgui_surfacelib/FontAmalgam.cpp
Unescape View File

@ -5,7 +5,7 @@
// $NoKeywords: $ // $NoKeywords: $
//=============================================================================// //=============================================================================//
#include "vgui_surfacelib/FontAmalgam.h" #include "common/vgui_surfacelib/FontAmalgam.h"
#include <tier0/dbg.h> #include <tier0/dbg.h>
#include <vgui/VGUI.h> #include <vgui/VGUI.h>
#include <vgui/ISurface.h> #include <vgui/ISurface.h>

4
vgui2/vgui_surfacelib/FontManager.cpp
Unescape View File

@ -5,8 +5,8 @@
//=====================================================================================// //=====================================================================================//
#include <locale.h> #include <locale.h>
#include "vgui_surfacelib/BitmapFont.h" #include "common/vgui_surfacelib/BitmapFont.h"
#include "vgui_surfacelib/FontManager.h" #include "common/vgui_surfacelib/FontManager.h"
#include <vgui/ISurface.h> #include <vgui/ISurface.h>
#include <tier0/dbg.h> #include <tier0/dbg.h>

2
vgui2/vgui_surfacelib/Win32Font.cpp
Unescape View File

@ -11,7 +11,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <malloc.h> #include <malloc.h>
#include "vgui_surfacelib/Win32Font.h" #include "common/vgui_surfacelib/Win32Font.h"
#include <tier0/dbg.h> #include <tier0/dbg.h>
#include <vgui/ISurface.h> #include <vgui/ISurface.h>
#include <tier0/mem.h> #include <tier0/mem.h>

4
vgui2/vgui_surfacelib/linuxfont.cpp
Unescape View File

@ -6,7 +6,7 @@
//=============================================================================// //=============================================================================//
#include "vgui_surfacelib/linuxfont.h" #include "common/vgui_surfacelib/linuxfont.h"
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
@ -24,7 +24,7 @@
#include <freetype/ftbitmap.h> #include <freetype/ftbitmap.h>
#include "materialsystem/imaterialsystem.h" #include "materialsystem/imaterialsystem.h"
#include "vgui_surfacelib/FontManager.h" #include "common/vgui_surfacelib/FontManager.h"
#include "FontEffects.h" #include "FontEffects.h"
// memdbgon must be the last include file in a .cpp file!!! // memdbgon must be the last include file in a .cpp file!!!

2
vgui2/vgui_surfacelib/wscript
Unescape View File

@ -38,7 +38,7 @@ def build(bld):
'../../public', '../../public',
'../../public/tier0', '../../public/tier0',
'../../public/tier1', '../../public/tier1',
'../../common', '../..',
] + bld.env.INCLUDES_FC + bld.env.INCLUDES_FT2 ] + bld.env.INCLUDES_FC + bld.env.INCLUDES_FT2
defines = [] defines = []

2
vguimatsurface/FontTextureCache.cpp
Unescape View File

@ -18,7 +18,7 @@
#endif #endif
#include "FontTextureCache.h" #include "FontTextureCache.h"
#include "MatSystemSurface.h" #include "MatSystemSurface.h"
#include <vgui_surfacelib/BitmapFont.h> #include "common/vgui_surfacelib/BitmapFont.h"
#include <vgui/IVGui.h> #include <vgui/IVGui.h>
#include <vgui_controls/Controls.h> #include <vgui_controls/Controls.h>
#include "bitmap/imageformat.h" #include "bitmap/imageformat.h"

2
vguimatsurface/FontTextureCache.h
Unescape View File

@ -11,7 +11,7 @@
#pragma once #pragma once
#endif #endif
#include "vgui_surfacelib/FontManager.h" #include "common/vgui_surfacelib/FontManager.h"
#include "utlrbtree.h" #include "utlrbtree.h"
#include <vgui/ISurface.h> #include <vgui/ISurface.h>
#include "utlmap.h" #include "utlmap.h"

5
vguimatsurface/MatSystemSurface.cpp
Unescape View File

@ -36,7 +36,6 @@ ILauncherMgr *g_pLauncherMgr = NULL;
#include "Input.h" #include "Input.h"
#include <vgui/IHTML.h> #include <vgui/IHTML.h>
#include <vgui/IVGui.h> #include <vgui/IVGui.h>
#include "vgui_surfacelib/FontManager.h"
#include "FontTextureCache.h" #include "FontTextureCache.h"
#include "MatSystemSurface.h" #include "MatSystemSurface.h"
#include "inputsystem/iinputsystem.h" #include "inputsystem/iinputsystem.h"
@ -56,9 +55,9 @@ ILauncherMgr *g_pLauncherMgr = NULL;
#include "../vgui2/src/VPanel.h" #include "../vgui2/src/VPanel.h"
#include <vgui/IInputInternal.h> #include <vgui/IInputInternal.h>
#if defined( _X360 ) #if defined( _X360 )
#include "xbox/xbox_win32stubs.h" #include "common/xbox/xbox_win32stubs.h"
#endif #endif
#include "xbox/xboxstubs.h" #include "common/xbox/xboxstubs.h"
#include "../vgui2/src/Memorybitmap.h" #include "../vgui2/src/Memorybitmap.h"
#pragma warning( disable : 4706 ) #pragma warning( disable : 4706 )

2
vguimatsurface/wscript
Unescape View File

@ -40,10 +40,10 @@ def build(bld):
includes = [ includes = [
'.', '.',
'..',
'../public', '../public',
'../public/tier0', '../public/tier0',
'../public/tier1', '../public/tier1',
'../common',
] ]
defines = [] defines = []

Write Preview
Loading…
Cancel
Save