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

INTEGRATION: CWS valgrind02 (1.2.230); FILE MERGED

Browse source 
2004/10/08 16:31:12 mhu 1.2.230.2: #i35209# salmain.o needs to be an SLO, i.e. PIC, and not linked into vcl.
2004/10/08 16:06:23 mhu 1.2.230.1: #i35209# Adapted salmain.cxx to use SAL_IMPLEMENT_MAIN() macro as recommended.
This commit is contained in:
Rüdiger Timm 2004-10-28 15:23:31 +00:00
parent bf3caf8afa
commit 6be38a4f1c
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
vcl/unx/source/plugadapt/makefile.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.2 $
# $Revision: 1.3 $
#
# last change: $Author: kz $ $Date: 2003-11-18 14:46:57 $
# last change: $Author: rt $ $Date: 2004-10-28 16:23:31 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -64,6 +64,8 @@ PRJ=..$/..$/..
PRJNAME=vcl
TARGET=salplug
LIBTARGET=NO
.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Settings -----------------------------------------------------
@ -83,11 +85,13 @@ dummy:
CFLAGS+=-DSAL_DLLPOSTFIX=\"$(DLLPOSTFIX)\"
OBJFILES=$(OBJ)$/salmain.obj
SLOFILES=\
$(SLO)$/salplug.obj\
$(SLO)$/salmain.obj\
$(SLO)$/salmain.obj \
$(SLO)$/salplug.obj
LIB1TARGET=$(SLB)$/$(TARGET).lib
LIB1OBJFILES=\
$(SLO)$/salplug.obj
.ENDIF # "$(GUIBASE)"!="unx"