diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-20 09:07:52 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-21 13:28:32 +0200 |
| commit | 63dcca42cebd3cb6f020ec75c0d225e1d7232e1c (patch) | |
| tree | f1b1442af9d7f6f4736ca9621389f6fcc78179e8 /sal/osl | |
| parent | 27388c9483b5e00b593ac126092c5bbb131492b0 (diff) | |
Re-work the vcl aspects of the iOS port
Don't try to use similar code as for OS X to manage windows, events
etc. I.e. don't use UIKit in vcl to do that. Instead, just do as in
the Android port, use the "headless" vcl backend. Do keep using
CoreText, though, not FreeType & fontconfig.
Start changing the iOS "Viewer" app to correspond to the Android
"desktop" app (so it should be renamed).
Work in progress since a long time, several crucial details still
missing, but committing for now.
Change-Id: Iac5fbf8def415e4d0d21e5200450a373420ad7ee
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/unx/security.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/osl/unx/security.c b/sal/osl/unx/security.c index 7cb3fc08f864..82f97a95e6fc 100644 --- a/sal/osl/unx/security.c +++ b/sal/osl/unx/security.c @@ -389,7 +389,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire return bRet; } -#ifndef MACOSX +#if !defined(MACOSX) && !defined(IOS) #define DOT_CONFIG "/.config" @@ -431,7 +431,7 @@ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* ps * support for Objective-C in the build environment */ -#define MACOSX_CONFIG_DIR "/Library/Application Support" +#define MACOSX_CONFIG_DIR "/Library/Application Support" /* Used on iOS, too */ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax) { if( osl_psz_getHomeDir(Security, pszDirectory, nMax - sizeof(MACOSX_CONFIG_DIR) + 1) ) |