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

INTEGRATION: CWS ause02 (1.41.6.2.60); FILE MERGED

Browse source 
2003/03/28 17:25:33 hjs 1.41.6.2.60.2: #i7178# corrected dependencies
2003/03/28 16:55:37 hjs 1.41.6.2.60.1: #i7178# corrected dependencies
This commit is contained in:
Vladimir Glazounov 2003-04-01 12:38:20 +00:00
parent 9355f5467c
commit 7dcf8d8320
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
svtools/util/makefile.mk
View file

@ -2,9 +2,9 @@
#*
#* $RCSfile: makefile.mk,v $
#*
#* $Revision: 1.42 $
#* $Revision: 1.43 $
#*
#* last change: $Author: hr $ $Date: 2003-03-27 14:39:53 $
#* last change: $Author: vg $ $Date: 2003-04-01 13:38:20 $
#*
#* The Contents of this file are made available subject to the terms of
#* either of the following licenses
@ -72,9 +72,7 @@ GEN_HID_OTHER=TRUE
ENABLE_EXCEPTIONS=TRUE
# --- Settings -----------------------------------------------------
.INCLUDE : svpre.mk
.INCLUDE : settings.mk
.INCLUDE : sv.mk
USE_LDUMP2=TRUE
@ -129,11 +127,6 @@ LIB7FILES= \
$(SLB)$/filepicker.lib \
$(SLB)$/heavyconfig.lib
.IF "$(GUI)" == "OS2"
LIB7FILES+= $(SLB)$/eaimp.lib
.ENDIF
.IF "$(GUI)" == "UNX"
LIB7FILES+= $(SLB)$/eaimp.lib
.ENDIF
@ -213,6 +206,7 @@ SHL1LIBS= \
$(LB)$/svmem.lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
SHL1DEPN=$(SHL2TARGETN)
DEF1NAME= $(SHL1TARGET)
DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
@ -257,7 +251,7 @@ DEF2DES =SvTools lite
APP1TARGET = bmpgui
APP1BASE = 0x10000000
APP1DEPN = $(L)$/itools.lib $(SVLIBDEPEND)
APP1DEPN = $(SHL1TARGETN) $(SHL2TARGETN)
APP1OBJS = $(OBJ)$/bmpgui.obj \
$(OBJ)$/bmpcore.obj
@ -277,7 +271,8 @@ APP1STDLIBS+= -lsvl$(UPD)$(DLLSUFFIX)
APP2TARGET = g2g
APP2BASE = 0x10000000
APP2DEPN = $(L)$/itools.lib $(SVLIBDEPEND)
APP2DEPN = $(SHL1TARGETN) $(SHL2TARGETN)
APP2OBJS = $(OBJ)$/g2g.obj
APP2STDLIBS = $(SVLIB) \