strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS chart2mst3 (1.52.12); FILE MERGED

Browse source 
2007/05/14 19:53:07 bm 1.52.12.8: RESYNC: (1.59-1.60); FILE MERGED
2007/04/24 23:53:08 bm 1.52.12.7: RESYNC: (1.58-1.59); FILE MERGED
2007/02/07 19:42:24 iha 1.52.12.6: RESYNC: (1.56-1.58); FILE MERGED
2006/11/24 21:22:53 bm 1.52.12.5: RESYNC: (1.54-1.56); FILE MERGED
2006/11/10 13:47:30 tl 1.52.12.4: #i71245#, #i69313#; old chart removed, fixed incorrectly shown default chart
2006/05/05 18:39:39 bm 1.52.12.3: RESYNC: (1.53-1.54); FILE MERGED
2006/01/26 00:16:12 bm 1.52.12.2: RESYNC: (1.52-1.53); FILE MERGED
2006/01/16 09:23:00 tl 1.52.12.1: #30052# added new resource file
This commit is contained in:
Vladimir Glazounov 2007-05-22 15:41:25 +00:00
parent c1112c65fc
commit 4eeea4a106
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sw/util/makefile.mk
View file

@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.60 $ # $Revision: 1.61 $
# #
# last change: $Author: kz $ $Date: 2007-05-10 16:27:59 $ # last change: $Author: vg $ $Date: 2007-05-22 16:41:25 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@ -73,6 +73,7 @@ sw_res_files= \
$(SRS)$/table.srs \ $(SRS)$/table.srs \
$(SRS)$/uiview.srs \ $(SRS)$/uiview.srs \
$(SRS)$/undo.srs \ $(SRS)$/undo.srs \
$(SRS)$/unocore.srs \
$(SRS)$/utlui.srs \ $(SRS)$/utlui.srs \
$(SRS)$/web.srs \ $(SRS)$/web.srs \
$(SRS)$/wrtsh.srs \ $(SRS)$/wrtsh.srs \
@ -102,11 +103,6 @@ LIB1TARGET =$(SLB)$/swall.lib
LIB1OBJFILES= $(OUT)$/slo$/swmodule.obj \ LIB1OBJFILES= $(OUT)$/slo$/swmodule.obj \
$(OUT)$/slo$/swdll.obj $(OUT)$/slo$/swdll.obj
.IF "$(OS)"!="MACOSX"
# static libraries
SHL1STDLIBS+= $(SCHLIB)
.ENDIF
# dynamic libraries # dynamic libraries
SHL1STDLIBS+= \ SHL1STDLIBS+= \
$(SVXLIB) \ $(SVXLIB) \
@ -135,11 +131,6 @@ SHL1STDLIBS+= \
$(AVMEDIALIB) \ $(AVMEDIALIB) \
$(XML2LIB) $(XML2LIB)
.IF "$(OS)"=="MACOSX"
# static libraries at end for OS X
SHL1STDLIBS+= $(SCHLIB)
.ENDIF
.IF "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT"
SHL1STDLIBS+= $(ADVAPI32LIB) SHL1STDLIBS+= $(ADVAPI32LIB)
.ENDIF # WNT .ENDIF # WNT