INTEGRATION: CWS scp2fix2 (1.1.24); FILE MERGED
2004/03/03 15:43:24 is 1.1.24.1: #115768# include USE_JAVAVER=TRUE Issue number: Submitted by: Reviewed by:
This commit is contained in:
parent
c9d7b4a90e
commit
ef014097e9
1 changed files with 7 additions and 7 deletions
|
@ -2,9 +2,9 @@
|
||||||
#
|
#
|
||||||
# $RCSfile: makefile.mk,v $
|
# $RCSfile: makefile.mk,v $
|
||||||
#
|
#
|
||||||
# $Revision: 1.1 $
|
# $Revision: 1.2 $
|
||||||
#
|
#
|
||||||
# last change: $Author: is $ $Date: 2004-02-05 18:10:08 $
|
# last change: $Author: rt $ $Date: 2004-03-04 14:10:07 $
|
||||||
#
|
#
|
||||||
# The Contents of this file are made available subject to the terms of
|
# The Contents of this file are made available subject to the terms of
|
||||||
# either of the following licenses
|
# either of the following licenses
|
||||||
|
@ -68,15 +68,15 @@ PRJNAME=scp2
|
||||||
TARGET=ooo
|
TARGET=ooo
|
||||||
TARGETTYPE=CUI
|
TARGETTYPE=CUI
|
||||||
|
|
||||||
.IF "$(ENABLE_CRASHDUMP)"!=""
|
USE_JAVAVER=TRUE
|
||||||
SCPDEFS+=-DENABLE_CRASHDUMP
|
|
||||||
.ENDIF
|
|
||||||
|
|
||||||
# --- Settings -----------------------------------------------------
|
# --- Settings -----------------------------------------------------
|
||||||
|
|
||||||
.INCLUDE : svpre.mk
|
|
||||||
.INCLUDE : settings.mk
|
.INCLUDE : settings.mk
|
||||||
.INCLUDE : sv.mk
|
|
||||||
|
.IF "$(ENABLE_CRASHDUMP)"!=""
|
||||||
|
SCPDEFS+=-DENABLE_CRASHDUMP
|
||||||
|
.ENDIF
|
||||||
|
|
||||||
.IF "$(JAVANUMVER)" >= "000100040000"
|
.IF "$(JAVANUMVER)" >= "000100040000"
|
||||||
SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE
|
SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE
|
||||||
|
|
Loading…
Reference in a new issue