mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bypass some weird crack when cross-compiling with MinGW

Browse Source
This commit is contained in:
Tor Lillqvist
2011-05-22 10:53:50 +03:00
parent f05f831829
commit 8c3740eb6e
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
external/gcc3_specific/makefile.mk vendored
View File

@@ -11,6 +11,10 @@ TARGET=gcc3_specific
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(CROSS_COMPILING)" == ""
# Don't do any of this weird and presumably obsolete crack when
# cross-compiling
.IF "$(COM)" == "GCC" .IF "$(COM)" == "GCC"
.IF "$(MINGW_SHARED_GCCLIB)" == "YES" .IF "$(MINGW_SHARED_GCCLIB)" == "YES"
@@ -38,6 +42,8 @@ $(MINGWGXXDLL) :
.ENDIF .ENDIF
.ENDIF
.ELSE .ELSE
.IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3" .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"

6
external/mingwheaders/makefile.mk vendored
View File

@@ -33,6 +33,10 @@ TARGET=mingwheaders
.IF "$(OS)$(COM)" == "WNTGCC" .IF "$(OS)$(COM)" == "WNTGCC"
.IF "$(CROSS_COMPILING)" == ""
# Don't do any of this weird and presumably obsolete crack when
# cross-compiling
# Cygwin and MinGW use different directories for the W32API headers # Cygwin and MinGW use different directories for the W32API headers
.IF "$(USE_MINGW)" == "cygwin" .IF "$(USE_MINGW)" == "cygwin"
MINGW_INCLUDE_DIR=$/usr$/include/mingw/ MINGW_INCLUDE_DIR=$/usr$/include/mingw/
@@ -206,5 +210,7 @@ clean:
.ENDIF .ENDIF
.ENDIF
.INCLUDE : target.mk .INCLUDE : target.mk