summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorschinz <schinz@epfl.ch>2003-07-10 13:23:24 +0000
committerschinz <schinz@epfl.ch>2003-07-10 13:23:24 +0000
commitbdf7315e7f0c8e6da4ab6cdd0da76e15282a4b2f (patch)
treea88e7ac509e6683926921a7b79ea3421e3433c7c /Makefile
parent61393510099ca97eb702cb47f78138b2fc162854 (diff)
downloadscala-bdf7315e7f0c8e6da4ab6cdd0da76e15282a4b2f.tar.gz
scala-bdf7315e7f0c8e6da4ab6cdd0da76e15282a4b2f.tar.bz2
scala-bdf7315e7f0c8e6da4ab6cdd0da76e15282a4b2f.zip
- introduced the new JVM backend as default, wh...
- introduced the new JVM backend as default, which uses FJBG instead of BCEL to generate bytecode
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e3a205cd11..eea5e8467d 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ COMPILER_ROOT = $(PROJECT_SOURCEDIR)/scalac
COMPILER_LIST = $(call READLIST,$(PROJECT_LISTDIR)/compiler.lst)
COMPILER_SOURCES += $(COMPILER_LIST:%=$(COMPILER_ROOT)/%)
COMPILER_JC_FILES = $(COMPILER_SOURCES)
-COMPILER_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(BCEL_JARFILE):$(MSIL_JARFILE)
+COMPILER_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(BCEL_JARFILE):$(MSIL_JARFILE):$(FJBG_JARFILE)
# scala interpreter
INTERPRETER_ROOT = $(PROJECT_SOURCEDIR)/scalai
@@ -128,6 +128,10 @@ BCEL_HOME ?= /home/linuxsoft/apps/BCEL-5
BCEL_JARFILE ?= $(BCEL_HOME)/bcel.jar
BCEL_LICENSE = $(BCEL_HOME)/LICENSE
+# FJBG
+FJBG_HOME ?= /home/linuxsoft/apps/fjbg/
+FJBG_JARFILE = $(FJBG_HOME)/jars/fjbg.jar
+
# needed for the .NET backend
MSIL_HOME ?= /home/linuxsoft/apps/java2net
MSIL_JARFILE ?= $(MSIL_HOME)/msil.jar