Commit 4c3993cb authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Makefile hacking to compile everything under windows, and to generate a luc4c.dll.

In particular, make sure we don't pass the '-cc gcc' option to
ocamlopt, as since ocaml version 3.11 (because of flexdll), it breaks
the compilation under windows.

Moreover, I've added the fenv.cc/.h (from the cygwin cvs rep) that is
currently only available in dev version of cygwin (feature introduced
the 10/09/2010).

Also, disable the ocaml/xlurette test as it is currently broken (i
will fix it later).
parent ac83fb63
......@@ -28,48 +28,23 @@
#------------------------------------------------------------------
#OCAML_INSTALL=$OCAMLLIB
include ../Makefile.common.source
AR=ar
ifeq ($(HOST_TYPE),win32)
# windows
OCAML_LIB="c:\TEMP\ocaml\lib"
OCAMLOPT = /cygdrive/c/TEMP/ocaml/bin/ocamlopt
OCAMLC = /cygdrive/c/TEMP/ocaml/bin/ocamlc
OCAML = /cygdrive/c/TEMP/ocaml/bin/ocaml
CPP_COMPILER=g++ -mno-cygwin
CPP_LINKER=g++ -mno-cygwin
else
ifeq ($(HOST_TYPE),sparc-sun)
OCAML_LIB=ocaml
OCAMLOPT =ocamlopt
OCAMLC = ocamlc
CPP_COMPILER=g++
CPP_LINKER=g++
else
ifeq ($(HOST_TYPE),mac)
OCAML_LIB=/private/var/automount/import/macos/ocaml/3.09.3/lib/ocaml
OCAMLOPT =ocamlopt -cc g++
OCAMLC = ocamlc
CPP_COMPILER=g++
OCAMLFLAGS= -cc g++
CPP_LINKER=g++
else
OCAML_LIB=ocaml
OCAMLOPT =ocamlopt
OCAMLC = ocamlc
CPP_COMPILER=g++ # -DGBDD_CML_PARANO -DGBDD_CML_DBG
CPP_LINKER=g++
endif
endif
endif
#OCAMLOPT = ocamlopt
CPP_FLAGS=-g -O0 -fno-operator-names
OCAML_LIB=$(OCAMLLIB)
CPP_COMPILER=$(GPP)
CPP_LINKER=$(GPP)
CPP_FLAGS=-g -O0 -fno-operator-names -I$(HOME)/$(HOST_TYPE)/include/ -I$(shell $(OCAMLC) -where)
LFLAGS = -cclib -lstdc++
all : bdd.a libbdd_stubs.a bdd.cmxa bdd.cma
# bdd.cmi : bdd.mli
# ocamlopt -c bdd.mli
......@@ -86,17 +61,16 @@ gbdd.o : gbdd.h gbdd.cc
$(CPP_COMPILER) -c $(CPP_FLAGS) gbdd.cc -o gbdd.o
test : bdd.cmx gbdd_cml.o gbdd.o test.cmx
$(OCAMLOPT) bdd.cmx test.cmx gbdd_cml.o gbdd.o $(LFLAGS) -o test
libbdd_stubs.a : gbdd_cml.o gbdd.o
ar rc libbdd_stubs.a gbdd_cml.o gbdd.o
$(AR) rc libbdd_stubs.a gbdd_cml.o gbdd.o
ranlib libbdd_stubs.a
%.cmo: %.ml %.cmi
%.cmo: %.ml
$(OCAMLC) -c $<
bdd.cma: bdd.cmo
$(OCAMLC) -a -o bdd.cma bdd.cmo
......@@ -107,10 +81,12 @@ bdd.cmxa : bdd.ml libbdd_stubs.a bdd.cmx
bdd.a: bdd.cmx
ar rc bdd.a bdd.o
$(AR) rc bdd.a bdd.o
ranlib bdd.a
all : bdd.a libbdd_stubs.a bdd.cmxa bdd.cma
test : bdd.cmx gbdd_cml.o gbdd.o test.cmx
$(OCAMLOPT) bdd.cmx test.cmx gbdd_cml.o gbdd.o $(LFLAGS) -o test
clean:
rm -f *.o *.cmo *.cmi *.cmx *.a *.cma *.cmxa
......@@ -121,7 +97,9 @@ cp:
cp bdd.a ../$(HOSTTYPE)/lib/libbdd.a
cp bdd.cm* ../$(HOSTTYPE)/lib/
VERIMAG_INSTALL_DIR=`ocamlc -where`/lucky
install:cp
VERIMAG_INSTALL_DIR=`$(OCAMLC) -where`/lucky
cp-verimag:
cp libbdd_stubs.a $(VERIMAG_INSTALL_DIR)
......
-include ./Makefile.version
# migth be necessary if camlidl is not installed for the current version of ocaml
# nb: to be done only once since for camlidl, the install is made in the ocaml install
# dir, which is not the case for polka and co.
build-camlidl:
cd camlidl-1.05/ && make clean && make all && make install
# to run after a 'git clone', or a change in the ocaml version
source: build
build: gen_version
./lnsw
cd polka && make clean; make all && make install&& cd .. &&\
cd GBDDML && make clean; make; make all && make cp && cd ..&&\
cd source && make clean; make install; cd ..&&\
cd polka && make clean && make all && make install&& cd .. &&\
cd GBDDML && make clean && make && make all && make cp && cd ..&&\
cd source && make clean && make install&& cd ..&&\
cd install && autoconf && cd ..&&\
./RUN_ME
#
clean:
cd polka; make clean; cd ..
cd GBDDML; make clean; cd ..
......
......@@ -2,91 +2,186 @@
# Makefile.common for building binaries
#
#
# A modifier si ncessaire !!!
# A modifier si ncessaire !!!
LURETTE_PATH = $(HOME)/lurette
# XXX HOSTTYPE doit etre defini !!
ifeq ($(HOST_TYPE),win32)
OCAML_LIB="c:\TEMP\ocaml\lib"
OCAMLOPT = /cygdrive/c/TEMP/ocaml/bin/ocamlopt
OCAMLC = /cygdrive/c/TEMP/ocaml/bin/ocamlc
OCAML = /cygdrive/c/TEMP/ocaml/bin/ocaml
CPP_COMPILER=g++ -mno-cygwin
CPP_LINKER=g++ -mno-cygwin
CC=gcc -mno-cygwin -Wall -g -DWIN32 -I "c:\TEMP\ocaml\lib"
OCAMLLIB = "c:\TEMP\ocaml\lib"
INCDIRS = u:\\cygwin\\lib c:\\TEMP\\ocaml\\lib
LIBDIRS = u:\\cygwin\\lib c:\\TEMP\\ocaml\\lib
CAML_INSTALL_DIR=/cygdrive/c/TEMP/ocaml
SYNCHRONE_DIR=//ARPONT/www-verimag/SYNCHRONE
SYNCHRONE_LURETTE_DIR=//ARPONT/www-verimag/SYNCHRONE/lurette/
EXE := .exe
HOSTTYPE32=win32
DWIN32 = -DWIN32 -mno-cygwin -I "c:\TEMP\ocaml\lib" -L "c:\TEMP\ocaml\lib"
PREFIX =$(HOME)/lurette
export LURETTE_PATH = $(HOME)/lurette
AR=ar
AS=as
OCAMLC=$(shell which ocamlc)
SYNCHRONE_DIR=/usr/local/www/DIST-TOOLS/SYNCHRONE
SYNCHRONE_LURETTE_DIR=$(SYNCHRONE_DIR)/lurette/
INCDIRS = $(PREFIX)/$(HOSTTYPE)/lib
LIBDIRS = $(PREFIX)/$(HOSTTYPE)/lib
CAMLIDL = camlidl
DWIN32 =
EXE :=
HOST_TYPE=$(HOSTTYPE)
# Where to install bins, libs, and include files
BIN_INSTALL_DIR = $(LURETTE_PATH)/$(HOSTTYPE)/bin
LIB_INSTALL_DIR = $(LURETTE_PATH)/$(HOSTTYPE)/lib
INC_INSTALL_DIR = $(LURETTE_PATH)/$(HOSTTYPE)/include
CPP=cpp
GCC=gcc
GPP=g++
# HOSTTYPE doit etre defini bien sur...
ifeq ($(HOSTTYPE),cygwin)
OCAML_PATH=/cygdrive/e/ocaml-3.12.0/bin/
OCAML_PATH=
CAMLP4=$(OCAML_PATH)camlp4
CAMLP4O=$(OCAML_PATH)camlp4o
CAMLP4OF=$(OCAML_PATH)camlp4of
CAMLP4OOF=$(OCAML_PATH)camlp4oof
OCAMLOPT=$(OCAML_PATH)ocamlopt
OCAMLC=$(OCAML_PATH)ocamlc
OCAMLDEP=$(OCAML_PATH)ocamldep
OCAMLRUN=$(OCAML_PATH)ocamlrun
OCAML=$(OCAML_PATH)ocaml
OCAMLMKTOP=$(OCAML_PATH)ocamlmktop
OCAMLLEX=$(OCAML_PATH)ocamllex
OCAMLYACC=$(OCAML_PATH)ocamlyacc
OCAMLCP=$(OCAML_PATH)ocamlcp
OCAMLDOC=$(OCAML_PATH)ocamldoc
OCAMLMKLIB=$(OCAML_PATH)ocamlmklib
OCAMLPROF=$(OCAML_PATH)ocamlprof
OCAMLLIB = `$(OCAMLC) -where`
CAML_INSTALL_DIR=`$(OCAMLC) -where`
WIN32 = t
CC=gcc
GCC=gcc
GPP=g++
CFLAGS=-g -O2 -fpic
SYNCHRONE_DIR=//ARPONT/www-verimag/DIST-TOOLS/SYNCHRONE
SYNCHRONE_LURETTE_DIR=$(SYNCHRONE_DIR)/lurette/
EXE :=.exe
else
ifeq ($(HOST_TYPE),sparc-sun)
EXE :=
ifeq ($(HOSTTYPE),sparc-sun)
INCDIRS = $(HOME)/$(HOSTTYPE)/lib $(SCADE_INSTALL_DIR)/lib /usr/local/soft/ocaml/3.08/lib/ocaml
LIBDIRS = $(HOME)/$(HOSTTYPE)/lib $(SCADE_INSTALL_DIR)/lib /usr/local/soft/ocaml/3.08/lib/ocaml
OCAMLLIB = /usr/local/soft/ocaml/3.08/lib/ocaml
CAML_INSTALL_DIR=/usr/local/soft/ocaml/current
SYNCHRONE_DIR=/usr/local/www/DIST-TOOLS/SYNCHRONE
SYNCHRONE_LURETTE_DIR=$(SYNCHRONE_DIR)/lurette/
EXE := #
HOSTTYPE32=$(HOST_TYPE)
DWIN32 =
else
ifeq ($(HOST_TYPE),mac)
ifeq ($(HOSTTYPE),mac)
CC=g++ -g
HOSTTYPE=mac
HOST_TYPE=mac
EXE :=
PREFIX =$(HOME)/lurette
LURETTE_PATH = $(PREFIX)
INCDIRS = $(PREFIX)/$(HOSTTYPE)/lib
LIBDIRS = $(PREFIX)/$(HOSTTYPE)/lib
OCAMLLIB = `ocamlc -where`
CAML_LIB=/private/var/automount/import/macos/ocaml/3.09.3/lib/ocaml
OCAMLFLAGS= -cc g++
CAML_INSTALL_DIR=`ocamlc -where`
SYNCHRONE_DIR=/usr/local/www/DIST-TOOLS/SYNCHRONE
SYNCHRONE_LURETTE_DIR=$(SYNCHRONE_DIR)/lurette/
HOSTTYPE32=$(HOST_TYPE)
DWIN32 =
else
ifeq ($(HOSTTYPE),i386-cross-win32)
# generate native win32 code using a cross compiler
CC=/usr/bin/i586-mingw32msvc-gcc -g -O2 -fpic -DWIN32
GCC=/usr/bin/i586-mingw32msvc-gcc
GPP=/usr/bin/i586-mingw32msvc-g++
AR=/usr/bin/i586-mingw32msvc-ar
AS=/usr/bin/i586-mingw32msvc-as
EXE :=.exe
DWIN32 = -DWIN32
OCAMLOPT=/usr/i586-mingw32msvc/bin/ocamlopt
OCAMLC=/usr/i586-mingw32msvc/bin/ocamlc
OCAMLDEP=/usr/i586-mingw32msvc/bin/ocamldep
OCAMLRUN=/usr/i586-mingw32msvc/bin/ocamlrun
OCAMLLIB = `/usr/i586-mingw32msvc/bin/ocamlc -where`
CAML_INSTALL_DIR=`/usr/i586-mingw32msvc/bin/ocamlc -where`
else
ifeq ($(HOSTTYPE),win32)
# via the mingw32 compilers
CC=gcc
GCC=gcc
GPP=g++
RANLIB=ranlib
CFLAGS=
AR=ar
AS=as
EXE := .exe
DWIN32 = -DWIN32
OCAML_PATH='e:/ocaml/Objective\ Caml/bin/'
OCAML_PATH=
CAMLP4=$(OCAML_PATH)camlp4
CAMLP4O=$(OCAML_PATH)camlp4o
CAMLP4OF=$(OCAML_PATH)camlp4of
CAMLP4OOF=$(OCAML_PATH)camlp4oof
OCAMLOPT=$(OCAML_PATH)ocamlopt$(EXE)
OCAMLC=$(OCAML_PATH)ocamlc
OCAMLDEP=$(OCAML_PATH)ocamldep
OCAMLRUN=$(OCAML_PATH)ocamlrun
OCAML=$(OCAML_PATH)ocaml
OCAMLMKTOP=$(OCAML_PATH)ocamlmktop
OCAMLLEX=$(OCAML_PATH)ocamllex
OCAMLYACC=$(OCAML_PATH)ocamlyacc
OCAMLCP=$(OCAML_PATH)ocamlcp
OCAMLDOC=$(OCAML_PATH)ocamldoc
OCAMLMKLIB=$(OCAML_PATH)ocamlmklib
OCAMLPROF=$(OCAML_PATH)ocamlprof
OCAMLLIB = `$(OCAMLC) -where`
OCAMLLIB="e:\ocaml\Objective Caml\lib"
CAML_INSTALL_DIR=`$(OCAMLC) -where`
DWIN32 = -DWIN32
else
# LINUX quoi ...
CC=gcc -g -O2 -fpic
EXE :=
# XXX si je met des choses la, elles se retrouvent dans les .cmxa gnrs, ce qui n'est pas de bonne augure...
PREFIX =$(HOME)/lurette
LURETTE_PATH = $(PREFIX)
INCDIRS = $(PREFIX)/$(HOSTTYPE)/lib
LIBDIRS = $(PREFIX)/$(HOSTTYPE)/lib
OCAMLLIB = `ocamlc -where`
OCAML_PATH=/usr/local/soft/ocaml/3.10.0/bin/
OCAML_PATH=
CAMLP4=$(OCAML_PATH)camlp4
CAMLP4O=$(OCAML_PATH)camlp4o
CAMLP4OF=$(OCAML_PATH)camlp4of
CAMLP4OOF=$(OCAML_PATH)camlp4oof
OCAMLOPT=$(OCAML_PATH)ocamlopt
OCAMLC=$(OCAML_PATH)ocamlc
OCAMLDEP=$(OCAML_PATH)ocamldep
OCAMLRUN=$(OCAML_PATH)ocamlrun
OCAML=$(OCAML_PATH)ocaml
OCAMLMKTOP=$(OCAML_PATH)ocamlmktop
OCAMLLEX=$(OCAML_PATH)ocamllex
OCAMLYACC=$(OCAML_PATH)ocamlyacc
OCAMLCP=$(OCAML_PATH)ocamlcp
OCAMLDOC=$(OCAML_PATH)ocamldoc
OCAMLMKLIB=$(OCAML_PATH)ocamlmklib
OCAMLPROF=$(OCAML_PATH)ocamlprof
OCAMLLIB = `$(OCAMLC) -where`
CAML_INSTALL_DIR=`$(OCAMLC) -where`
CC=gcc -g -O2 -fpic
OCAMLC=$(shell which ocamlc)
CAML_INSTALL_DIR=`dirname $(OCAMLC)`
CAML_INSTALL_DIR=`ocamlc -where`
SYNCHRONE_DIR=/usr/local/www/DIST-TOOLS/SYNCHRONE
SYNCHRONE_LURETTE_DIR=$(SYNCHRONE_DIR)/lurette/
HOSTTYPE32=$(HOST_TYPE)
DWIN32 =
endif
endif
endif
endif
endif
OCAMLMAKEFILE = ../OcamlMakefile
OCAMLMAKEFILE = $(LURETTE_PATH)/OcamlMakefile
VERSION:=$(shell E=`git log --oneline | wc -l` ; echo "$$E-166" | bc )
VERSION:="1.$(VERSION)"
# well, finally, set it manually...
VERSION:=1.52
......
#***********************************************************************
#* *
#* CamlIDL *
#* *
#* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
#* *
#* Copyright 1999 Institut National de Recherche en Informatique et *
#* en Automatique. All rights reserved. This file is distributed *
#* under the terms of the GNU Library General Public License. *
#* *
#***********************************************************************
#* $Id: Makefile,v 1.18 2000/08/19 11:04:55 xleroy Exp $
include config/Makefile
all:
cd compiler; $(MAKE) all
cd runtime; $(MAKE) all
cd lib; $(MAKE) all
cd tools; $(MAKE) all
install:
cd compiler; $(MAKE) install
cd runtime; $(MAKE) install
cd lib; $(MAKE) install
cd tools; $(MAKE) install
clean:
cd compiler; $(MAKE) clean
cd runtime; $(MAKE) clean
cd lib; $(MAKE) clean
cd tools; $(MAKE) clean
depend:
cd compiler; $(MAKE) depend
cd runtime; $(MAKE) depend
cd lib; $(MAKE) depend
cd tools; $(MAKE) depend
......@@ -7,13 +7,13 @@ CFLAGS = \
-I../../../include
LIBS = -lluc4c_nc -llucky_nc -lgmp -lm -ldl -lstdc++
LUC2C=../../../$(HOST_TYPE)/bin/luc2c
LUC2C=../../../$(HOSTTYPE)/bin/luc2c
ifeq ($(HOST_TYPE),mac)
ifeq ($(HOSTTYPE),mac)
LINKER=g++ -g
LIBS = -lluc4c_nc -llucky_nc -lgmp -lm -ldl
endif
ifeq ($(HOST_TYPE),win32)
ifeq ($(HOSTTYPE),win32)
EXE=.exe
CFLAGS = \
-L../../../lib \
......@@ -21,9 +21,9 @@ ifeq ($(HOST_TYPE),win32)
-Winline -Wimplicit-function-declaration
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++ -mno-cygwin -lole32
LUC2C=../../../$(HOST_TYPE)/bin/luc2c$(EXE)
LUC2C=../../../$(HOSTTYPE)/bin/luc2c$(EXE)
endif
ifeq ($(HOST_TYPE),cygwin)
ifeq ($(HOSTTYPE),cygwin)
EXE=.exe
CFLAGS = \
-L../../../lib \
......@@ -31,7 +31,7 @@ ifeq ($(HOST_TYPE),cygwin)
-Winline -Wimplicit-function-declaration
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++
LUC2C=../../../$(HOST_TYPE)/bin/luc2c$(EXE)
LUC2C=../../../$(HOSTTYPE)/bin/luc2c$(EXE)
endif
......@@ -57,7 +57,7 @@ clean:
rm -f run *.o *~ foo foo.h foo.c *.gp *.plot *.rif
test : clean foo$(EXE)
ifeq ($(HOST_TYPE),win32)
ifeq ($(HOSTTYPE),win32)
foo$(EXE)
else
./foo > test.rif
......
......@@ -62,11 +62,11 @@ $(OBJDIR)/%.o : $(OBJDIR) $(SRCDIR)/%.c
call_external_c_code.luc_pp:call_external_c_code.luc
../../../$(HOST_TYPE)/bin/lucky_cpp call_external_c_code.luc call_external_c_code.luc_pp $(LD_ARCH)
../../../$(HOSTTYPE)/bin/lucky_cpp call_external_c_code.luc call_external_c_code.luc_pp $(LD_ARCH)
test: clean $(OBJDIR)/$(MAIN).$(DLEXT) call_external_c_code.luc_pp
rm -f test.rif0 && \
../../../$(HOST_TYPE)/bin/lucky$(EXE) -l 10 $(OPT) -seed 834966010 \
../../../$(HOSTTYPE)/bin/lucky$(EXE) -l 10 $(OPT) -seed 834966010 \
call_external_c_code.luc_pp | sed -e "s/^M//" | grep -v " Lucky Version" > test.rif
rm -f test.res && diff -u -i test.rif.exp test.rif > test.res
[ ! -s test.res ] && make clean
......
include
-include Makefile.foo
export LURETTE_PATH=../../..
go:
../../../$(HOST_TYPE)/bin/luc2c --luciole foo.luc
../../../$(HOSTTYPE)/bin/luc2c --luciole foo.luc
test: go
make -f Makefile.foo && make clean
\ No newline at end of file
......@@ -3,23 +3,23 @@ LD = gcc -g
EXE=
CFLAGS = \
-L../../../$(HOST_TYPE)/lib \
-I../../../$(HOST_TYPE)/include
-L../../../$(HOSTTYPE)/lib \
-I../../../$(HOSTTYPE)/include
LIBS = -lluc4c_nc -llucky_nc -lgmp -lm -ldl -lstdc++
LUC2C=../../../$(HOST_TYPE)/bin/luc2c
LUC2C=../../../$(HOSTTYPE)/bin/luc2c
ifeq ($(HOST_TYPE),win32)
ifeq ($(HOSTTYPE),win32)
EXE=.exe
CFLAGS = \
-L../../../$(HOST_TYPE)/lib -L/cygdrive/c/TEMP/MinGW/lib \
-I../../../$(HOST_TYPE)/include \
-L../../../$(HOSTTYPE)/lib -L/cygdrive/c/TEMP/MinGW/lib \
-I../../../$(HOSTTYPE)/include \
-Winline -Wimplicit-function-declaration
LIBS = -lluc4c_nc -llucky_nc -lgmp -lws2_32 -lm -lstdc++
LUC2C=../../../$(HOST_TYPE)/bin/luc2c$(EXE)
LUC2C=../../../$(HOSTTYPE)/bin/luc2c$(EXE)
endif
ifeq ($(HOST_TYPE),mac)
ifeq ($(HOSTTYPE),mac)
LD = g++ -g
LIBS = -lluc4c_nc -llucky_nc -lgmp -lm -ldl
endif
......@@ -61,7 +61,7 @@ clean:
rm -f run *.o *~ call_foo_ext* call_foo.c call_foo.h call_foo_loop.c call_foo_loop.h foo.h foo.c *.gp *.plot *.rif *.ec foo #*
test : clean foo
ifeq ($(HOST_TYPE),win32)
ifeq ($(HOSTTYPE),win32)
foo$(EXE)
else
touch test.rif ; rm test.rif
......
EXE=
ifeq ($(HOST_TYPE),win32)
ifeq ($(HOSTTYPE),win32)
EXE=.exe
endif
LUCKY=../../../$(HOST_TYPE)/bin/lucky$(EXE) -seed 1
LUCKY=../../../$(HOSTTYPE)/bin/lucky$(EXE) -seed 1
test1 :
......
EXE=
ifeq ($(HOST_TYPE),win32)
ifeq ($(HOSTTYPE),win32)
EXE=.exe
endif
LUCKY=../../../$(HOST_TYPE)/bin/lucky$(EXE)
LUCKY=../../../$(HOSTTYPE)/bin/lucky$(EXE)
test:
$(LUCKY) -l 10 $(OPT) -seed 1 \
simpler.luc | sed -e "s/^M//" | grep -v " Lucky Version" > test.rif && \
......
LUCKY=../../../$(HOST_TYPE)/bin/lucky
LUCKY=../../../$(HOSTTYPE)/bin/lucky
test:
$(LUCKY) -l 10 $(OPT) -seed 1 \
six_lines.luc | sed -e "s/^M//" | grep -v " Lucky Version" > test.rif && \
......
MAIN=draw-ex
LUCKYDRAW_INSTALL_DIR=../../../$(HOST_TYPE)/lib
LUCKYDRAW_INSTALL_DIR=../../../$(HOSTTYPE)/lib
CLIBS=-cclib -lluckyDraw
MLLIBS= str.cmxa unix.cmxa bdd.cmxa polka.cmxa luckyDraw.cmxa
WIN32_OCAMLOPT_FLAGS =
ifeq ($(HOST_TYPE),win32)
ifeq ($(HOSTTYPE),win32)
WIN32_OCAMLOPT_FLAGS = -cclib -mno-cygwin -cclib -lole32
endif
......
......@@ -14,7 +14,7 @@ MAIN=rabbit
CMXA_LIB = unix.cmxa str.cmxa bdd.cmxa polka.cmxa luc4ocaml.cmxa
CMA_LIB=luc4ocaml.cma
LUC4OCAML_INSTALL_DIR = -I ../../$(HOST_TYPE)/lib
LUC4OCAML_INSTALL_DIR = -I ../../$(HOSTTYPE)/lib
# LUC4OCAML_INSTALL_DIR = -I +lucky
......
EXE=
ifeq ($(HOST_TYPE),win32)
ifeq ($(HOSTTYPE),win32)
EXE=.exe
endif
......
......@@ -2,10 +2,11 @@
CMXA_LIB = unix.cmxa str.cmxa bdd.cmxa polka.cmxa luc4ocaml.cmxa
CMA_LIB=luc4ocaml.cma
LUC4OCAML_INSTALL_DIR = -I ../../../$(HOST_TYPE)/lib
LUC4OCAML_INSTALL_DIR = -I ../../../$(HOSTTYPE)/lib
# LUC4OCAML_INSTALL_DIR = -I +lucky
LUCKY=../../../$(HOST_TYPE)/bin/lucky
LUCKY=../../../$(HOSTTYPE)/bin/lucky
LUCKY_CPP=../../../$(HOSTTYPE)/bin/lucky_cpp
MAIN=rabbit
......@@ -73,7 +74,7 @@ utest:
#
# one can use unixisms to compose lucky programs ...
rif:rabbit-speed.luc
rm -f speed.rif; $(LUCKY) -l 2000 -pp $(LUCKY)_cpp rabbit-speed.luc $(LD_ARCH) | \
rm -f speed.rif; $(LUCKY) -l 2000 -pp $(LUCKY_CPP) rabbit-speed.luc $(LD_ARCH) | \