diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:53:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:53:44 +0000 |
| commit | c656f3a6914a784eb4270cfdbc52994955fd24b6 (patch) | |
| tree | ab5f3c4c1f6a70c9c82cd1e542351585b87fc849 /moz | |
| parent | cdb03775c3f97eac633274b35ebdf9881a4f87fd (diff) | |
INTEGRATION: CWS mingwport03 (1.7.8); FILE MERGED
2007/03/19 15:53:20 vg 1.7.8.4: RESYNC: (1.8-1.9); FILE MERGED
2006/11/09 12:37:50 vg 1.7.8.3: RESYNC: (1.7-1.8); FILE MERGED
2006/10/24 13:17:47 vg 1.7.8.2: #i53572# MinGW port
2006/09/21 16:16:55 vg 1.7.8.1: #i53572# MinGW port
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 6dccb82ae532..6895a7439fa4 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: obo $ $Date: 2007-01-25 13:45:27 $ +# last change: $Author: vg $ $Date: 2007-03-26 13:53:44 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -164,15 +164,28 @@ SYSTEM_JPEG:= # For W32-tcsh CC and CXX must not contain the wrapper, and W32-4nt ( in # some cases ) doesn't work with DOS path notation when building mozilla. +.IF "$(COM)"=="GCC" +CC:=$(CC:s/guw.pl //:s/ -mno-cygwin//) +CXX:=$(CXX:s/guw.pl //:s/ -mno-cygwin//) +CPP:=$(CC) -E +LD:=ld +LIBS:=-lsupc++ +.EXPORT : CPP LIBS +.ELSE CC:=cl.exe CXX:=cl.exe +.ENDIF # Variables to install/use our own wintools MOZTOOLSUNPACK:=$(MISC)$/build$/moztoolsunpack MOZTOOLSINST:=$(MISC)$/build$/moztoolsinst .IF "$(USE_SHELL)"!="4nt" MOZ_TOOLS_DOS:=$(shell cygpath -ad "$(MISC)")\build\moztoolsinst +.IF "$(COM)"=="GCC" +PATH!:=$(PATH):$(shell cygpath $(MOZ_TOOLS_DOS))/bin:$(shell cygpath $(MOZ_TOOLS_DOS))/vc71/bin +.ELSE PATH!:=$(shell cygpath $(MOZ_TOOLS_DOS))/vc71/bin:$(shell cygpath $(MOZ_TOOLS_DOS))/bin:$(PATH) +.ENDIF SET_MOZ_TOOLS_INSTALL_BAT:=setenv MOZ_TOOLS "$(MOZ_TOOLS_DOS)" .ELSE # "$(USE_SHELL)"!="4nt" # MOZ_TOOLS must contain an absolute path |