Commit a27ab980 authored by Erick Gallesio's avatar Erick Gallesio

Fixed compilation problem with Cygwin. Now all tests are running on Windows

parent 3486557c
...@@ -42,7 +42,7 @@ subdir = doc ...@@ -42,7 +42,7 @@ subdir = doc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/stklos-compile.1.in $(srcdir)/stklos-config.1.in \ $(srcdir)/stklos-compile.1.in $(srcdir)/stklos-config.1.in \
$(srcdir)/stklos-genlex.1.in $(srcdir)/stklos-pkg.1.in \ $(srcdir)/stklos-genlex.1.in $(srcdir)/stklos-pkg.1.in \
$(srcdir)/stklos.1.in TODO $(srcdir)/stklos.1.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
;;;; ;;;;
;;;; Author: Erick Gallesio [eg@essi.fr] ;;;; Author: Erick Gallesio [eg@essi.fr]
;;;; Creation date: 14-Bun-2007 09:24 (eg) ;;;; Creation date: 14-Bun-2007 09:24 (eg)
;;;; Last file update: 27-May-2011 23:21 (eg) ;;;; Last file update: 4-Dec-2011 18:10 (eg)
;;;; ;;;;
(define make-external-function #f) (define make-external-function #f)
...@@ -144,9 +144,14 @@ ...@@ -144,9 +144,14 @@
doc> doc>
|# |#
(define-macro (define-external name parameters . args) (define-macro (define-external name parameters . args)
(let ((lib-name (key-get args :library-name "")) (let* ((lib (key-get args :library-name ""))
(entry-name (key-get args :entry-name (symbol->string name))) (lib-name (if (and (equal? lib "")
(return-type (key-get args :return-type :void))) (equal? (running-os) 'cygwin-windows))
"cygwin1.dll"
lib))
(entry-name (key-get args :entry-name (symbol->string name)))
(return-type (key-get args :return-type :void)))
`(define ,name (make-external-function ,entry-name `(define ,name (make-external-function ,entry-name
',parameters ',parameters
,return-type ,return-type
......
...@@ -42,7 +42,7 @@ POST_UNINSTALL = : ...@@ -42,7 +42,7 @@ POST_UNINSTALL = :
bin_PROGRAMS = stklos$(EXEEXT) bin_PROGRAMS = stklos$(EXEEXT)
subdir = src subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/extraconf.h.in $(srcdir)/stklosconf.h.in TODO $(srcdir)/extraconf.h.in $(srcdir)/stklosconf.h.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment