diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 15:50:12 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 15:50:12 +0000 |
| commit | d4b78cfea95a85cb32564f9ee338934cc0133bd7 (patch) | |
| tree | 1b99ae5ec158b76d1a6ab134c4fefe2078505556 /solenv/inc | |
| parent | 3cece8e0af54a744595db102c1fdd698d0fa85f3 (diff) | |
INTEGRATION: CWS os2port03 (1.220.8); FILE MERGED
2008/07/16 12:19:47 obr 1.220.8.4: RESYNC: (1.224.2.1-1.233); FILE MERGED
2008/02/08 08:15:58 obr 1.220.8.3: RESYNC: (1.224-1.224.2.1); FILE MERGED
2008/01/15 13:52:09 obr 1.220.8.2: RESYNC: (1.220-1.224); FILE MERGED
2008/01/15 09:36:36 ydario 1.220.8.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/settings.mk | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 87318c6dd69a..3bb495f4f62f 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -8,7 +8,7 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.236 $ +# $Revision: 1.237 $ # # This file is part of OpenOffice.org. # @@ -704,7 +704,7 @@ PROCESSOUT*=$(MISC) .INCLUDE .IGNORE : office.mk .INCLUDE : libs.mk -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" VERSIONOBJ=$(SLO)$/_version.obj .ENDIF @@ -712,11 +712,11 @@ VERSIONOBJ=$(SLO)$/_version.obj VERSIONOBJ=$(SLO)$/_version.o .ENDIF -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" WINVERSIONNAMES=$(UNIXVERSIONNAMES) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="WNT" +.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(COM)"=="GCC" SHELLLIB=-lgdi32 -lshell32 -ladvapi32 -lcomdlg32 .ELSE @@ -857,6 +857,11 @@ SCPDEFS+=-DCCNUMVER=$(CCNUMVER) .IF "$(COM)"=="GCC" SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3) .ENDIF # "$(SHORTSTDCPP3)"!="" +# extend library path for OS/2 gcc/wlink +.IF "$(GUI)"=="OS2" +LIB:=$(LB);$(SLB);$(ILIB) +.ENDIF + UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD) @@ -869,7 +874,7 @@ UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)$/inc -I$(PRJ)$/$(INPATH)$/idl -I$(OUT)$/in CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME) -.IF "$(USE_STLP_DEBUG)" != "" +.IF "$(USE_STLP_DEBUG)" != "" && "$(GUI)"!="OS2" CDEFS+=-D_STLP_DEBUG .ENDIF @@ -992,6 +997,10 @@ LNTFLAGSOUTOBJ=-os .INCLUDE : unx.mk .ENDIF +.IF "$(GUI)" == "OS2" +.INCLUDE : os2.mk +.ENDIF + # for multiprocess building in external modules # allow seperate handling EXTMAXPROCESS*=$(MAXPROCESS) |