[Libreoffice-commits] .: 3 commits - sal/inc sal/rtl sal/typesconfig xml2cmp/source xml2cmp/util
Tor Lillqvist
tml at kemper.freedesktop.org
Fri May 13 17:09:10 PDT 2011
sal/inc/osl/endian.h | 20 +++++++++++++++++++-
sal/inc/sal/alloca.h | 7 +++++++
sal/inc/sal/config.h | 11 +++++++++++
sal/rtl/source/macro.hxx | 6 ++----
sal/typesconfig/makefile.mk | 24 ++++++++++++++++++++++++
xml2cmp/source/finder/makefile.mk | 8 +-------
xml2cmp/source/support/makefile.mk | 10 +---------
xml2cmp/source/xcd/makefile.mk | 13 +------------
xml2cmp/util/makefile.mk | 4 +---
9 files changed, 67 insertions(+), 36 deletions(-)
New commits:
commit ca61c5c96d56fc80259dcc361e29cea8cd138fcf
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 03:04:08 2011 +0300
Add defines for iOS
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index 49d778a..9abf8cf 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -130,13 +130,31 @@ extern "C" {
# endif
#endif
+#ifdef IOS
+# include <machine/endian.h>
+# if BYTE_ORDER == LITTLE_ENDIAN
+# ifndef _LITTLE_ENDIAN
+# define _LITTLE_ENDIAN
+# endif
+# elif BYTE_ORDER == BIG_ENDIAN
+# ifndef _BIG_ENDIAN
+# define _BIG_ENDIAN
+# endif
+# elif BYTE_ORDER == PDP_ENDIAN
+# ifndef _PDP_ENDIAN
+# define _PDP_ENDIAN
+# endif
+# endif
+#endif
+
/** Check supported platform.
*/
#if !defined(_WIN32) && \
!defined(LINUX) && !defined(NETBSD) && \
!defined(AIX) && !defined(OPENBSD) && \
!defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD) && \
- !defined(DRAGONFLY)
+ !defined(DRAGONFLY) && \
+ !defined(IOS)
# error "Target platform not specified !"
#endif
diff --git a/sal/inc/sal/alloca.h b/sal/inc/sal/alloca.h
index 2328280..eb31ad5 100644
--- a/sal/inc/sal/alloca.h
+++ b/sal/inc/sal/alloca.h
@@ -50,6 +50,13 @@
#define INCLUDED_SYS_TYPES_H
#endif
+#elif defined (IOS)
+
+#ifndef INCLUDED_SYS_TYPES_H
+#include <sys/types.h>
+#define INCLUDED_SYS_TYPES_H
+#endif
+
#elif defined (WNT)
#ifndef INCLUDED_MALLOC_H
diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h
index 25bb385..211b738 100644
--- a/sal/inc/sal/config.h
+++ b/sal/inc/sal/config.h
@@ -98,6 +98,17 @@
#define SAL_SYSCONFIGFILE( name ) "." name "rc"
#endif
+#ifdef IOS
+#define SAL_UNX
+#define SAL_DLLEXTENSION
+#define SAL_DLLPREFIX "lib"
+#define SAL_PRGEXTENSION ".bin"
+#define SAL_PATHSEPARATOR ':'
+#define SAL_PATHDELIMITER '/'
+#define SAL_CONFIGFILE( name ) name "rc"
+#define SAL_SYSCONFIGFILE( name ) "." name "rc"
+#endif
+
#ifdef sun
#undef sun
#define sun sun
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx
index 133a7cc..2567451 100644
--- a/sal/rtl/source/macro.hxx
+++ b/sal/rtl/source/macro.hxx
@@ -45,6 +45,8 @@
#endif
#elif defined MACOSX
#define THIS_OS "MacOSX"
+#elif defined IOS
+#define THIS_OS "iOS"
#elif defined NETBSD
#define THIS_OS "NetBSD"
#elif defined FREEBSD
@@ -109,8 +111,4 @@ this is inserted for the case that the preprocessor ignores error
#endif
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 578725c8fc7e9692f4f6b7085677a5191b9b1006
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 02:58:24 2011 +0300
When cross-compiling, use what configure script figured out
diff --git a/sal/typesconfig/makefile.mk b/sal/typesconfig/makefile.mk
index d5f7db3..061d15d 100644
--- a/sal/typesconfig/makefile.mk
+++ b/sal/typesconfig/makefile.mk
@@ -55,7 +55,31 @@ APP1DEF=
ALLTAR : $(INCCOM)$/sal$/typesizes.h
.ENDIF # "$(L10N-framework)"==""
+.IF "$(CROSS_COMPILING)"==""
+
$(INCCOM)$/sal$/typesizes.h : $(BIN)$/$(TARGET)
-$(MKDIR) $(INCCOM)$/sal
$(AUGMENT_LIBRARY_PATH) $(BIN)$/$(TARGET) $@
+.ELSE
+
+$(INCCOM)$/sal$/typesizes.h :
+ -$(MKDIRHIER) $(INCCOM)$/sal
+ echo '/* This file is autogenerated from configure script data */' >$@
+ echo >>$@
+ echo "#define SAL_TYPES_ALIGNMENT2 $(ALIGNOF_SHORT)" >>$@
+ echo "#define SAL_TYPES_ALIGNMENT4 $(ALIGNOF_INT)" >>$@
+.IF "$(SIZEOF_LONG)"=="8"
+ echo "#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_LONG)" >>$@
+.ELIF "$(SIZEOF_DOUBLE)"=="8"
+ echo "#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_DOUBLE)" >>$@
+.ELSE
+ echo "#error alignment of some 8-byte type unknown" >>$@
+.ENDIF
+ echo "#define SAL_TYPES_SIZEOFSHORT $(SIZEOF_SHORT)" >>$@
+ echo "#define SAL_TYPES_SIZEOFINT $(SIZEOF_INT)" >>$@
+ echo "#define SAL_TYPES_SIZEOFLONG $(SIZEOF_LONG)" >>$@
+ echo "#define SAL_TYPES_SIZEOFLONGLONG $(SIZEOF_LONGLONG)" >>$@
+ echo "#define SAL_TYPES_SIZEOFPOINTER $(SIZEOF_POINTER)" >>$@
+
+.ENDIF
\ No newline at end of file
commit 23b21dc031425a829b4e90d20014082d2f4309fd
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat May 14 01:08:07 2011 +0300
Cross-compilation support
diff --git a/xml2cmp/source/finder/makefile.mk b/xml2cmp/source/finder/makefile.mk
index c850ec7..928e2a8 100644
--- a/xml2cmp/source/finder/makefile.mk
+++ b/xml2cmp/source/finder/makefile.mk
@@ -30,6 +30,7 @@ PRJ=..$/..
PRJNAME=xml2cmp
TARGET=srvdepy
TARGETTYPE=CUI
+TARGETPLATFORM=BUILD
# --- Settings -----------------------------------------------------
@@ -37,15 +38,12 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-
-
# --- Files --------------------------------------------------------
OBJFILES= \
$(OBJ)$/dependy.obj \
$(OBJ)$/dep_main.obj
-
# --- Targets ------------------------------------------------------
APP1TARGET= $(TARGET)
@@ -57,11 +55,7 @@ LIBSALCPPRT=$(0)
UWINAPILIB=$(0)
.ENDIF
-
APP1LIBS= $(LB)$/$(TARGET).lib $(LB)$/x2c_xcdl.lib $(LB)$/x2c_support.lib
APP1DEPN= $(LB)$/$(TARGET).lib $(LB)$/x2c_xcdl.lib $(LB)$/x2c_support.lib
-
.INCLUDE : target.mk
-
-
diff --git a/xml2cmp/source/support/makefile.mk b/xml2cmp/source/support/makefile.mk
index 8f0abcd..4259353 100644
--- a/xml2cmp/source/support/makefile.mk
+++ b/xml2cmp/source/support/makefile.mk
@@ -30,8 +30,7 @@ PRJ=..$/..
PRJNAME=xml2cmp
TARGET=x2c_support
TARGETTYPE=CUI
-
-
+TARGETPLATFORM=BUILD
# --- Settings -----------------------------------------------------
@@ -39,8 +38,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-
-
# --- Files --------------------------------------------------------
OBJFILES= \
@@ -50,12 +47,7 @@ OBJFILES= \
$(OBJ)$/syshelp.obj \
$(OBJ)$/badcast.obj
-
-
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-
-
diff --git a/xml2cmp/source/xcd/makefile.mk b/xml2cmp/source/xcd/makefile.mk
index cc9d2bc..ca3f7b4 100644
--- a/xml2cmp/source/xcd/makefile.mk
+++ b/xml2cmp/source/xcd/makefile.mk
@@ -30,22 +30,18 @@ PRJ=..$/..
PRJNAME=xml2cmp
TARGET=x2c_xcd
TARGETTYPE=CUI
+TARGETPLATFORM=BUILD
LIBTARGET=NO
-
-
# --- Settings -----------------------------------------------------
ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-
-
# --- Files --------------------------------------------------------
-
LIBONLYFILES=\
$(OBJ)$/cr_html.obj \
$(OBJ)$/cr_index.obj \
@@ -55,25 +51,18 @@ LIBONLYFILES=\
$(OBJ)$/xmlelem.obj \
$(OBJ)$/xmltree.obj
-
OBJFILES=\
$(OBJ)$/main.obj \
$(LIBONLYFILES)
-
LIB1TARGET=$(LB)$/$(TARGET).lib
LIB1OBJFILES=\
$(OBJFILES)
-
LIB2TARGET=$(LB)$/$(TARGET)l.lib
LIB2OBJFILES=\
$(LIBONLYFILES)
-
-
-
# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
diff --git a/xml2cmp/util/makefile.mk b/xml2cmp/util/makefile.mk
index 12111ef..082cf13 100644
--- a/xml2cmp/util/makefile.mk
+++ b/xml2cmp/util/makefile.mk
@@ -30,6 +30,7 @@ PRJ=..
PRJNAME=xml2cmp
TARGET=xml2cmp
TARGETTYPE=CUI
+TARGETPLATFORM=BUILD
# --- Settings -----------------------------------------------------
ENABLE_EXCEPTIONS=TRUE
@@ -38,7 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
-
# --- Targets ------------------------------------------------------
APP1TARGET= $(TARGET)
@@ -52,5 +52,3 @@ APP1DEPN= $(LB)$/x2c_xcd.lib $(LB)$/x2c_support.lib
APP1RPATH= NONE
.INCLUDE : target.mk
-
-
More information about the Libreoffice-commits
mailing list