diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-11-09 23:31:48 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-11-09 23:31:48 (GMT) |
| commit | 73441f624232feb0486d766ea39b0c18cdad581d (patch) | |
| tree | caeff8e769b4f34988d8102d1677a96329bca6f5 /src/ucl-1-fixes.patch | |
| parent | 20bf529ce96a59514a9870874baf77874374c8f9 (diff) | |
| parent | 85d472be18f64d77ba9237cd11602a4c83690288 (diff) | |
| download | mxe-73441f624232feb0486d766ea39b0c18cdad581d.zip mxe-73441f624232feb0486d766ea39b0c18cdad581d.tar.gz mxe-73441f624232feb0486d766ea39b0c18cdad581d.tar.bz2 | |
Merge pull request #974 from LuaAndC/ucl
add package ucl
Diffstat (limited to 'src/ucl-1-fixes.patch')
| -rw-r--r-- | src/ucl-1-fixes.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/src/ucl-1-fixes.patch b/src/ucl-1-fixes.patch new file mode 100644 index 0000000..34a1ee3 --- /dev/null +++ b/src/ucl-1-fixes.patch @@ -0,0 +1,52 @@ +This file is part of MXE. +See index.html for further information. + +From 34ee29b2233764519fecf3a9c5d7ed36ad680215 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Sun, 8 Nov 2015 23:58:55 +0100 +Subject: [PATCH] do not use winmm + + * do not link against winmm + * comment out call to timeGetTime (defined in winmm) + +winmm was used only to measure performance in an example. +--- + acc/acclib/uclock.ch | 2 +- + configure | 8 -------- + 2 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/acc/acclib/uclock.ch b/acc/acclib/uclock.ch +index d20dc9c..2de1f31 100644 +--- a/acc/acclib/uclock.ch ++++ b/acc/acclib/uclock.ch +@@ -157,7 +157,7 @@ ACCLIB_PUBLIC(void, acc_uclock_read) (acc_uclock_handle_p h, acc_uclock_p c) + #elif (__ACCLIB_UCLOCK_USE_CLOCK) + c->ticks.t32 = clock(); + #elif (__ACCLIB_UCLOCK_USE_WINMM) +- c->ticks.t32 = timeGetTime(); ++ //c->ticks.t32 = timeGetTime(); + #elif (__ACCLIB_UCLOCK_USE_GETRUSAGE) + struct rusage ru; + if (getrusage(RUSAGE_SELF, &ru) != 0) c->ticks.rd = 0; +diff --git a/configure b/configure +index 8f7e300..13bc5b4 100755 +--- a/configure ++++ b/configure +@@ -31409,14 +31409,6 @@ done + + + +-if test "X$GCC" = Xyes; then +-case $host_os in +-cygwin* | mingw* | pw32*) +- LIBS="$LIBS -lwinmm" ;; +-*) +- ;; +-esac +-fi + + + +-- +1.7.10.4 + |