1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- Makefile.OCaml.orig 2014-12-30 02:21:28 UTC
+++ Makefile.OCaml
@@ -72,7 +72,7 @@ LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
# This should be set to an appropriate value automatically, depending
# on whether the lablgtk library is available
LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
-LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk2
+LABLGTK2LIB=$(OCAMLLIBDIR)/site-lib/lablgtk2
##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
## at the moment and we don't want to confuse people by building it by default
ifeq ($(OSARCH),osx)
@@ -91,7 +91,7 @@ INCLFLAGS=-I lwt -I ubase -I system
### Default parameters
INCLFLAGS=-I lwt -I ubase -I system
-CAMLFLAGS+=$(INCLFLAGS)
+CAMLFLAGS+=$(INCLFLAGS) -unsafe-string
CAMLFLAGS+=-I system/$(SYSTEM) -I lwt/$(SYSTEM)
ifeq ($(OSARCH),win32)
@@ -233,7 +233,7 @@ OCAMLLIBS+=unix.cma str.cma bigarray.cma
# File extensions will be substituted for the native code version
OCAMLLIBS+=unix.cma str.cma bigarray.cma
-COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT)
+COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT) hash_compat$(OBJ_EXT)
########################################################################
### User Interface setup
@@ -292,7 +292,7 @@ ifeq ($(UISTYLE), gtk2)
# Gtk2 GUI
ifeq ($(UISTYLE), gtk2)
- CAMLFLAGS+=-I +lablgtk2
+ CAMLFLAGS+=-I +site-lib/lablgtk2
OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo
OCAMLLIBS+=lablgtk.cma
endif
|
