diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-24 14:20:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-24 14:20:38 +0000 |
| commit | ebc41420264bf3ebe897845f6d3f4f3c391a481e (patch) | |
| tree | b47fc1bfa446b8d3916a84910d49682056a733b0 /desktop/util | |
| parent | f16d3fe9f60a68f649125e4efa20478a0c7c2bf8 (diff) | |
INTEGRATION: CWS c08v001 (1.60.62); FILE MERGED
2006/01/17 17:16:19 hro 1.60.62.2: #129366#, #129509# New icons for IGOS office
2006/01/04 15:53:00 hro 1.60.62.1: #129509# #129366# Added new customized icons and bin targets
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index bf725313beef..194446f8abfd 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.60 $ +# $Revision: 1.61 $ # -# last change: $Author: rt $ $Date: 2005-10-19 12:20:40 $ +# last change: $Author: hr $ $Date: 2006-01-24 15:20:38 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -76,6 +76,20 @@ TARGETOBJS= \ RCFILES=verinfo.rc .ENDIF +# --- Linking of static libs --------------------------------------- + +.IF "$(GUI)" == "WNT" + +LIB1TARGET=$(SLB)$/$(TARGET).lib +LIB1FILES=$(TARGETOBJS) +LIB1FILES += $(OBJ)$/copyright_ascii_sun.obj + +#LIB2TARGET=$(SLB)$/officeloader.lib +#LIB2FILES=$(OBJ)$/officeloader.obj + + +.ENDIF + # --- Linken der Applikation --------------------------------------- .IF "$(OS)" == "MACOSX" @@ -211,7 +225,6 @@ APP7OBJS = \ STDLIB7=advapi32.lib .ENDIF # WNT - all: $(BIN)$/so ALLTAR .IF "$(GUI)" == "WNT" |