[Libreoffice-commits] .: 2 commits - automation/source extensions/prj wizards/prj

[Tor Lillqvist]

 automation/source/testtool/objtest.cxx |    4 ++++
 extensions/prj/build.lst               |    2 +-
 wizards/prj/build.lst                  |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 436ae0a64241f0c2bc134aa674a7937d98187fb2
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 16 20:53:01 2011 +0300

    Add numbers for iOS and Android

diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index b55e062..7ad2778 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -462,6 +462,10 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
     abGP.Append( "27" );  // DragonFly/i386
 #elif defined DRAGONFLY && defined X86_64
     abGP.Append( "28" );  // DragonFly/x86-64
+#elif defined IOS && defined ARM
+    abGP.Append( "29" );  // iOS
+#elif defined ANDROID && defined ARM
+    abGP.Append( "30" );  // Android
 #else
 #error ("unknown platform. please request an ID for your platform on qa/dev")
 #endif
commit e9d206d6407083b7c8fe24792f6e17f2bf2d6746
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 16 01:15:41 2011 +0300

    Use DESKTOP and NATIVE where appropriate

diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index 9e31422..f39f665 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -1,4 +1,4 @@
-ex  extensions :  officecfg  TRANSLATIONS:translations rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL
+ex  extensions :  officecfg  TRANSLATIONS:translations DESKTOP:rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL
 
 ex  extensions                                  usr1    -   all ex_mkout NULL
 ex  extensions\inc                              nmake   -   all ex_inc NULL
diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst
index 0b8b1e0..09c8333 100644
--- a/wizards/prj/build.lst
+++ b/wizards/prj/build.lst
@@ -1,4 +1,4 @@
-wz      wizards     :    TRANSLATIONS:translations rsc javaunohelper unoil LIBXSLT:libxslt NULL
+wz      wizards     :    TRANSLATIONS:translations DESKTOP:rsc javaunohelper unoil LIBXSLT:libxslt NULL
 wz      wizards\util                                            nmake           -       all     wz_util NULL
 wz      wizards\source\config                                   nmake           -       all     wz_config NULL
 wz      wizards\source\configshare                              nmake           -       all     wz_configshare NULL