diff options
| author | Beat Forster <elisabethegli@beat-forsters-macbook-pro.local> | 2009-10-08 15:05:37 +0200 |
|---|---|---|
| committer | Lukas Zeller <luz@synthesis.ch> | 2009-10-13 16:18:49 +0200 |
| commit | 2cc5f243ae0b56dab07899850ec769d9585b5608 (patch) | |
| tree | fed80525cacbad801188bbb3ac8da32fd9b84e2b | |
| parent | b672adf33380aa39449c1c036f1c32e867a85722 (diff) | |
ANDROID strings added
| -rw-r--r-- | src/global_options.h | 2 | ||||
| -rwxr-xr-x | src/platform_adapters/linux/configfiles.cpp | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/global_options.h b/src/global_options.h index a205c6f..3ab8e73 100644 --- a/src/global_options.h +++ b/src/global_options.h @@ -84,6 +84,8 @@ #define SYSYNC_PLATFORM_NAME "iPhoneOS" #elif defined(MACOSX) #define SYSYNC_PLATFORM_NAME "MacOSX" + #elif defined(ANDROID) + #define SYSYNC_PLATFORM_NAME "Android" #elif defined(LINUX) #define SYSYNC_PLATFORM_NAME "Linux" #elif defined(__PALM_OS__) diff --git a/src/platform_adapters/linux/configfiles.cpp b/src/platform_adapters/linux/configfiles.cpp index 0376a4b..2eafc22 100755 --- a/src/platform_adapters/linux/configfiles.cpp +++ b/src/platform_adapters/linux/configfiles.cpp @@ -36,7 +36,11 @@ static bool getOSVersion(string &aOSVersion) static bool getHardwareName(string &aHardwareName) { // Obtain Device name + #ifdef ANDROID + aHardwareName="Android Device"; + #else aHardwareName="Linux PC"; + #endif return true; } // getHardwareName @@ -239,7 +243,11 @@ bool getLocalDeviceID(string &aURI) hostName=szHostname; // just name of machine } // generate URI from name + #ifdef ANDROID + aURI="android:"; + #else aURI="linux:"; // %%% SCTS does not like http:// here, so we take os:xxxx + #endif // add name of this machine (fully qualified if possible) aURI+=hostName; // this is more or less unique |