mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-11-23 13:30:02 +00:00
Get it to build and run on iOS too, not just Mac. There's some odd DPI issue though.
This commit is contained in:
parent
0bbaaef787
commit
5f4257bf4a
@ -1323,7 +1323,7 @@ elseif(IOS AND NOT LIBRETRO)
|
||||
Common/Battery/AppleBatteryClient.m
|
||||
)
|
||||
|
||||
set(nativeExtraLibs ${nativeExtraLibs} "-framework Foundation -framework MediaPlayer -framework AudioToolbox -framework CoreGraphics -framework QuartzCore -framework UIKit -framework GLKit -framework OpenAL -framework AVFoundation -framework CoreLocation -framework CoreVideo -framework CoreMedia -framework CoreServices -framework Metal -framework IOSurface" )
|
||||
set(nativeExtraLibs ${nativeExtraLibs} "-framework Foundation -framework MediaPlayer -framework AudioToolbox -framework CoreGraphics -framework QuartzCore -framework UIKit -framework GLKit -framework OpenAL -framework AVFoundation -framework CoreLocation -framework CoreText -framework CoreVideo -framework CoreMedia -framework CoreServices -framework Metal -framework IOSurface" )
|
||||
if(EXISTS "${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks/GameController.framework")
|
||||
set(nativeExtraLibs ${nativeExtraLibs} "-weak_framework GameController")
|
||||
endif()
|
||||
|
@ -90,7 +90,7 @@ TextDrawer *TextDrawer::Create(Draw::DrawContext *draw) {
|
||||
drawer = new TextDrawerWin32(draw);
|
||||
#elif PPSSPP_PLATFORM(UWP)
|
||||
drawer = new TextDrawerUWP(draw);
|
||||
#elif PPSSPP_PLATFORM(MAC)
|
||||
#elif PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
|
||||
drawer = new TextDrawerCocoa(draw);
|
||||
#elif defined(USING_QT_UI)
|
||||
drawer = new TextDrawerQt(draw);
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
#include "ppsspp_config.h"
|
||||
|
||||
#if PPSSPP_PLATFORM(MAC)
|
||||
#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
|
||||
|
||||
#include <map>
|
||||
#include "Common/Render/Text/draw_text.h"
|
||||
@ -37,4 +37,4 @@ protected:
|
||||
std::map<CacheKey, std::unique_ptr<TextMeasureEntry>> sizeCache_;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -431,4 +431,4 @@ void TextDrawerCocoa::OncePerFrame() {
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user