Skip to content

C
core
Kaydet (Commit) 03770d3e authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien
Dosyalara gözat
Seçenekler

INTEGRATION: CWS jl8 (1.1.4); FILE MERGED 

2004/06/23 12:31:33 jl 1.1.4.1: #i30342# refactorizing plugin
üst 4a501dab
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
Dosyayı görüntüle @ 03770d3e
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.1 $ # $Revision: 1.2 $
# #
# last change: $Author: jl $ $Date: 2004-05-03 14:27:38 $ # last change: $Author: hr $ $Date: 2004-07-23 11:50:08 $
# #
# 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
...@@ -75,7 +75,7 @@ ENABLE_EXCEPTIONS=true ...@@ -75,7 +75,7 @@ ENABLE_EXCEPTIONS=true
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(SOLAR_JAVA)"=="" .IF "$(SOLAR_JAVA)"=="" || "$(OS)"=="MACOSX"
nojava: nojava:
@echo "Not building jvmfwk/plugins/javaenvsetup/ because Java is disabled" @echo "Not building jvmfwk/plugins/javaenvsetup/ because Java is disabled"
.ENDIF .ENDIF
...@@ -87,9 +87,7 @@ OBJFILES=$(OBJ)$/javaldx.obj ...@@ -87,9 +87,7 @@ OBJFILES=$(OBJ)$/javaldx.obj
APP1TARGET=javaldx APP1TARGET=javaldx
APP1OBJS=$(OBJFILES) APP1OBJS=$(OBJFILES)
APP1STDLIBS=$(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) $(JVMFWKLIB) APP1STDLIBS=$(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) $(JVMFWKLIB)
.IF "$(OS)"=="MACOSX"
APP1STDLIBS+= -lstdc++
.ENDIF
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment