diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-04 15:21:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-04 15:21:39 +0000 |
| commit | 38f23da58ef1f17f31219b8dd33900944d6557f7 (patch) | |
| tree | 5fcfebe3ecf9b37a440893008b90c7c005332b98 /desktop/util | |
| parent | e84334e6f9d377fee06bd07741ae01593fd26fcc (diff) | |
INTEGRATION: CWS mingwport09 (1.74.46); FILE MERGED
2007/12/11 12:16:16 vg 1.74.46.1: #i83133# catch-up fixes for MinGW port
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 104b9d8c05..080490ca42 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.74 $ +# $Revision: 1.75 $ # -# last change: $Author: vg $ $Date: 2007-10-15 13:01:22 $ +# last change: $Author: obo $ $Date: 2008-01-04 16:21:39 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -213,8 +213,13 @@ APP6DEPN= $(APP1TARGETN) $(APP6RES) verinfo.rc APP6VERINFO=verinfo.rc APP6LINKRES=$(MISC)$/soffice6.res APP6ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico +.IF "$(COM)"=="GCC" +APP6OBJS = \ + $(OBJ)$/officeloader.obj +.ELSE APP6OBJS = \ $(OBJ)$/officeloader.obj $(OBJ)$/extendloaderenvironment.obj +.ENDIF STDLIB6=$(ADVAPI32LIB) $(SHLWAPILIB) APP7TARGET=officeloader @@ -224,8 +229,13 @@ APP7DEPN= $(APP1TARGETN) $(APP7RES) ooverinfo.rc APP7VERINFO=ooverinfo.rc APP7LINKRES=$(MISC)$/ooffice7.res APP7ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico +.IF "$(COM)"=="GCC" +APP7OBJS = \ + $(OBJ)$/officeloader.obj +.ELSE APP7OBJS = \ $(OBJ)$/officeloader.obj $(OBJ)$/extendloaderenvironment.obj +.ENDIF STDLIB7=$(ADVAPI32LIB) $(SHLWAPILIB) # Until every DLL is linked against $(DELAYLOADOBJ) just as on wntmsci10: |