WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 06:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Undo runtime fonts

Browse Source
This commit is contained in:
Madthijs
2021-05-04 16:05:15 +02:00
parent 0725828a5f
commit 57798c05c6
5 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AerofoilMac/AerofoilMac.xcodeproj/project.pbxproj
View File

@@ -417,8 +417,6 @@
5CAC542E26373C60006AE5FB /* Fonts.gpf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5C54D688262D8AE600AB55E0 /* Fonts.gpf */; };
5CB787202639D1D800D8FDB6 /* GpAllocator_C.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB7871E2639D1D800D8FDB6 /* GpAllocator_C.cpp */; };
5CB787212639D1D800D8FDB6 /* GpAllocator_C.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB7871F2639D1D800D8FDB6 /* GpAllocator_C.h */; };
5CB787262639D86F00D8FDB6 /* GpFontHandler_FreeType2.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB787242639D86F00D8FDB6 /* GpFontHandler_FreeType2.h */; };
5CB787272639D86F00D8FDB6 /* GpFontHandler_FreeType2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB787252639D86F00D8FDB6 /* GpFontHandler_FreeType2.cpp */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -1012,8 +1010,6 @@
5C54D6AD262D8AE600AB55E0 /* Nemo's Market.mov.gpf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Nemo's Market.mov.gpf"; sourceTree = "<group>"; };
5CB7871E2639D1D800D8FDB6 /* GpAllocator_C.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GpAllocator_C.cpp; path = ../AerofoilPortable/GpAllocator_C.cpp; sourceTree = "<group>"; };
5CB7871F2639D1D800D8FDB6 /* GpAllocator_C.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GpAllocator_C.h; path = ../AerofoilPortable/GpAllocator_C.h; sourceTree = "<group>"; };
5CB787242639D86F00D8FDB6 /* GpFontHandler_FreeType2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GpFontHandler_FreeType2.h; path = ../GpFontHandler_FreeType2/GpFontHandler_FreeType2.h; sourceTree = "<group>"; };
5CB787252639D86F00D8FDB6 /* GpFontHandler_FreeType2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GpFontHandler_FreeType2.cpp; path = ../GpFontHandler_FreeType2/GpFontHandler_FreeType2.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -1079,7 +1075,6 @@
5C54D0B92629B6E900AB55E0 /* AerofoilShared */ = {
isa = PBXGroup;
children = (
5CB787232639D83A00D8FDB6 /* GpFontHandler_FreeType2 */,
5C54D59F262B3C6B00AB55E0 /* GpShell */,
5C54D4CE262B3C2D00AB55E0 /* GpApp */,
5C54D28F2629BC6700AB55E0 /* PortabilityLayer */,
@@ -1612,15 +1607,6 @@
path = Resources/Houses;
sourceTree = SOURCE_ROOT;
};
5CB787232639D83A00D8FDB6 /* GpFontHandler_FreeType2 */ = {
isa = PBXGroup;
children = (
5CB787252639D86F00D8FDB6 /* GpFontHandler_FreeType2.cpp */,
5CB787242639D86F00D8FDB6 /* GpFontHandler_FreeType2.h */,
);
name = GpFontHandler_FreeType2;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@@ -1780,7 +1766,6 @@
5C54D54B262B3C2E00AB55E0 /* Room.h in Headers */,
5C54D4152629BC6C00AB55E0 /* PLMenus.h in Headers */,
5C54D2732629B86700AB55E0 /* crc32.h in Headers */,
5CB787262639D86F00D8FDB6 /* GpFontHandler_FreeType2.h in Headers */,
5C54D2702629B86700AB55E0 /* inflate.h in Headers */,
5C54D57E262B3C2E00AB55E0 /* GliderStructs.h in Headers */,
5C54D42E2629BC6C00AB55E0 /* GpAppInterface.h in Headers */,
@@ -2196,7 +2181,6 @@
5C54D3C92629BC6B00AB55E0 /* SimpleGraphic.cpp in Sources */,
5C54D4252629BC6C00AB55E0 /* PLIconWidget.cpp in Sources */,
5C54D4282629BC6C00AB55E0 /* RandomNumberGenerator.cpp in Sources */,
5CB787272639D86F00D8FDB6 /* GpFontHandler_FreeType2.cpp in Sources */,
5C54D550262B3C2E00AB55E0 /* DynamicMaps.cpp in Sources */,
5C54D4502629BC6D00AB55E0 /* PLButtonWidget.cpp in Sources */,
5C54D568262B3C2E00AB55E0 /* Scoreboard.cpp in Sources */,

BIN
AerofoilMac/Resources/ApplicationResources.gpf
View File

Binary file not shown.

BIN
AerofoilMac/Resources/Fonts.gpf
View File

Binary file not shown.

BIN
AerofoilMac/Resources/Houses/Castle o' the Air.gpf
View File

Binary file not shown.

7
AerofoilX/GpMain_SDL_X.cpp
View File

@@ -23,8 +23,6 @@
GpXGlobals g_gpXGlobals;
IGpFontHandler *GpDriver_CreateFontHandler_FreeType2(const GpFontHandlerProperties &properties);
IGpDisplayDriver *GpDriver_CreateDisplayDriver_SDL_GL2(const GpDisplayDriverProperties &properties);
IGpAudioDriver *GpDriver_CreateAudioDriver_SDL(const GpAudioDriverProperties &properties);
IGpInputDriver *GpDriver_CreateInputDriver_SDL2_Gamepad(const GpInputDriverProperties &properties);
@@ -63,10 +61,8 @@ SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[])
drivers->SetDriver<GpDriverIDs::kAlloc>(GpAllocator_C::GetInstance());
g_gpGlobalConfig.m_displayDriverType = EGpDisplayDriverType_SDL_GL2;
g_gpGlobalConfig.m_audioDriverType = EGpAudioDriverType_SDL2;
g_gpGlobalConfig.m_fontHandlerType = EGpFontHandlerType_FreeType2;
g_gpGlobalConfig.m_fontHandlerType = EGpFontHandlerType_None;
EGpInputDriverType inputDrivers[] =
{
@@ -84,7 +80,6 @@ SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[])
GpDisplayDriverFactory::RegisterDisplayDriverFactory(EGpDisplayDriverType_SDL_GL2, GpDriver_CreateDisplayDriver_SDL_GL2);
GpAudioDriverFactory::RegisterAudioDriverFactory(EGpAudioDriverType_SDL2, GpDriver_CreateAudioDriver_SDL);
GpInputDriverFactory::RegisterInputDriverFactory(EGpInputDriverType_SDL2_Gamepad, GpDriver_CreateInputDriver_SDL2_Gamepad);
GpFontHandlerFactory::RegisterFontHandlerFactory(EGpFontHandlerType_FreeType2, GpDriver_CreateFontHandler_FreeType2);
if (logger)
logger->Printf(IGpLogDriver::Category_Information, "SDL environment configured, starting up");