diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-16 21:04:10 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-16 21:05:14 +0300 |
| commit | 8b5cf7fb57c0f68ee312d7f7b404533807349318 (patch) | |
| tree | 225332a33d0ae93aaf57dc0c2fcaa273012a49ab /solenv/inc | |
| parent | 2eb39893df0fa008da0f863caa65d8aea7eb107b (diff) | |
For kicks, enable cross-building for Android on MIPS
Change-Id: I6fa2b9a50c525fb2d8666a144409eb9a3ad2698a
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/unx.mk | 10 | ||||
| -rw-r--r-- | solenv/inc/unxand.mk (renamed from solenv/inc/unxandr.mk) | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 619c2e828736..dc62a50b13f3 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -91,12 +91,8 @@ .INCLUDE : unxlngr.mk .ENDIF -.IF "$(COM)$(OS)$(CPU)" == "GCCANDROIDR" -.INCLUDE : unxandr.mk -.ENDIF - -.IF "$(COM)$(OS)$(CPU)" == "GCCANDROIDI" -.INCLUDE : unxandr.mk +.IF "$(COM)$(OS)" == "GCCANDROID" +.INCLUDE : unxand.mk .ENDIF .IF "$(COM)$(OS)$(CPU)" == "GCCLINUXA" @@ -199,4 +195,4 @@ SOLARLIB+=-L$(KDE_ROOT)/lib64 OOO_LIBRARY_PATH_VAR *= DYLD_LIBRARY_PATH .ELSE OOO_LIBRARY_PATH_VAR *= LD_LIBRARY_PATH -.ENDIF
\ No newline at end of file +.ENDIF diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxand.mk index 5065aa1491f7..8025388a9f64 100644 --- a/solenv/inc/unxandr.mk +++ b/solenv/inc/unxand.mk @@ -31,6 +31,8 @@ CDEFAULTOPT=-Os .INCLUDE : unxgcc.mk .IF "$(CPU)" == "I" CDEFS+=-DX86 +.ELIF "$(CPU)" == "M" +CDEFS+=-DMIPS .ELSE CDEFS+=-DARM32 .ENDIF |