Changeset 7113

Timestamp:

01/27/10 23:23:38 (7 weeks ago)

Author:

metamorph68

Message:

Some more details for win32 compilation..

Location:

trunk/liquidsoap

Files:

• Makefile.rules (modified) (3 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile (modified) (1 diff)
• src/protocols/extproto.ml (modified) (1 diff)

trunk/liquidsoap/Makefile.rules

@@ -58 +58 @@
 ifdef ocaml_progs
         rm -f *_depend
-        rm -f $(ocaml_progs)
+        rm -f $(ocaml_progs)$(OS_EXEC_SUFFIX)
 endif
 
@@ -65 +65 @@
 all-auto-ocaml-prog:
         @for prog in $(ocaml_progs) $(if $(BUILD_TESTS),$(ocaml_tests)) ; do \
-                $(MAKE) PROG=$$prog $$prog || exit $$? ; \
+                $(MAKE) PROG=$$prog $$prog$(OS_EXEC_SUFFIX) || exit $$? ; \
         done
 
@@ -79 +79 @@
                 $($(PROG)_sources) $($(PROG)_headers) > $@
 
-$(PROG): $($(PROG)_sources:.ml=.$(o))
-        $(V)echo OCAMLC -o $(PROG)
-        $(V)$(OCAMLC) -o $(PROG) \
+$(PROG)$(OS_EXEC_SUFFIX): $($(PROG)_sources:.ml=.$(o))
+        $(V)echo OCAMLC -o $(PROG)$(OS_EXEC_SUFFIX)
+        $(V)$(OCAMLC) -o $(PROG)$(OS_EXEC_SUFFIX) \
                 $(_OCAML_CFLAGS) $(OCAML_CFLAGS) \
                 $(_OCAML_LFLAGS) $(OCAML_LFLAGS) \

trunk/liquidsoap/configure.ac

@@ -146 +146 @@
 # Check for OS
 OS_TYPE=`$OCAMLFIND ocamlc -config | grep os_type | tr -d ' ' | cut -d':' -f 2`
-if test "$OS_TYPE" \!= "Win32" ; then
+if test "$OS_TYPE" \!= "Unix" ; then
+  OS_EXEC_SUFFIX=".exe"
+else
   OS_EXEC_SUFFIX=""
-else
-  OS_EXEC_SUFFIX=".exe"
 fi
 AC_SUBST(OS_EXEC_SUFFIX)

trunk/liquidsoap/src/Makefile

@@ -6 +6 @@
 DISTFILES = $(wildcard *.mli) Makefile $(wildcard *.ml) META.in
 
-ocaml_progs= liquidsoap$(OS_EXEC_SUFFIX)
+ocaml_progs= liquidsoap
 
 ogg_demuxer = \

trunk/liquidsoap/src/protocols/extproto.ml

@@ -62 +62 @@
       end
 
+let exec_suffix = if Sys.os_type = "Unix" then "" else ".exe"
+
 let extproto = [
-  "ufetch",
+  "ufetch" ^ exec_suffix,
   [ "smb"; "http"; "file" ],
   (fun prog src dst ->
      [|prog;"--quiet";src;"file://"^dst|]) ;
 
-  "wget",
+  "wget" ^ exec_suffix,
   [ "http";"https";"ftp" ],
   (fun prog src dst ->