[Unison-hackers] [unison-svn] r501 - trunk/src

[vouillon at seas.upenn.edu]

Author: vouillon
Date: 2012-08-07 12:57:51 -0400 (Tue, 07 Aug 2012)
New Revision: 501

Modified:
   trunk/src/Makefile.OCaml
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
Log:
* Fixed Makefile for cross-compiling towards Windows (updated to MinGW-w64)


Modified: trunk/src/Makefile.OCaml
===================================================================
--- trunk/src/Makefile.OCaml	2012-08-07 16:33:59 UTC (rev 500)
+++ trunk/src/Makefile.OCaml	2012-08-07 16:57:51 UTC (rev 501)
@@ -5,11 +5,6 @@
 ####################################################################
 ### Try to automatically guess OS
 
-ifeq (${OSCOMP},cross) # Cross-compilation under Linux
-  OSARCH=win32gnuc
-  PATH := /usr/i586-mingw32msvc/bin:$(PATH)
-endif
-
 ifeq (${OSCOMP},cygwingnuc) # Define this if compiling with Cygwin GNU C
   OSARCH=win32gnuc
   ETAGS=/bin/etags
@@ -46,6 +41,11 @@
 endif
 endif
 
+ifeq (${OSCOMP},cross) # Cross-compilation under Linux
+  OSARCH=win32gnuc
+  EXEC_PREFIX=i686-w64-mingw32-
+endif
+
 # The OCaml lib dir is used by all versions
 # It is extracted from 'ocamlc -v' and Windows '\' separators are turned
 # to Unix '/' separators, and extraneous control-M's are deleted.
@@ -364,11 +364,11 @@
 endif
 
 ifeq ($(PROFILING), true)
-  OCAMLC=ocamlcp
+  OCAMLC=$(EXEC_PREFIX)ocamlcp
 else
-  OCAMLC=ocamlc
+  OCAMLC=$(EXEC_PREFIX)ocamlc
 endif
-OCAMLOPT=ocamlopt
+OCAMLOPT=$(EXEC_PREFIX)ocamlopt
 
 ifeq ($(NATIVE), true)
   ## Set up for native code compilation

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2012-08-07 16:33:59 UTC (rev 500)
+++ trunk/src/RECENTNEWS	2012-08-07 16:57:51 UTC (rev 501)
@@ -1,3 +1,8 @@
+CHANGES FROM VERSION 2.45.13
+
+* Fixed Makefile for cross-compiling towards Windows (updated to MinGW-w64)
+
+-------------------------------
 CHANGES FROM VERSION 2.45.12
 
 * fsmonitor.py: fixed busy wait under Windows

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2012-08-07 16:33:59 UTC (rev 500)
+++ trunk/src/mkProjectInfo.ml	2012-08-07 16:57:51 UTC (rev 501)
@@ -75,3 +75,4 @@
 
 
 
+