fix using Cygwin to create extensions for MSVC build
svn: r5341
This commit is contained in:
parent
40110e35cc
commit
ba1305ba3b
|
@ -73,6 +73,7 @@
|
||||||
(case (string->symbol (path->string (system-library-subpath #f)))
|
(case (string->symbol (path->string (system-library-subpath #f)))
|
||||||
[(ppc-macosx i386-macosx) '("-fno-common")]
|
[(ppc-macosx i386-macosx) '("-fno-common")]
|
||||||
[(ppc-darwin) '("-fno-common")]
|
[(ppc-darwin) '("-fno-common")]
|
||||||
|
[(win32\\i386) '("-DAS_MSVC_EXTENSION")]
|
||||||
[else null])
|
[else null])
|
||||||
gcc-cpp-flags))
|
gcc-cpp-flags))
|
||||||
|
|
||||||
|
|
|
@ -209,11 +209,14 @@
|
||||||
[win-borland? "bcc"]
|
[win-borland? "bcc"]
|
||||||
[else "msvc"])
|
[else "msvc"])
|
||||||
f)))]
|
f)))]
|
||||||
|
[dllfile (lambda (f)
|
||||||
|
(path->string
|
||||||
|
(build-path std-library-dir f)))]
|
||||||
[filethunk (lambda (f)
|
[filethunk (lambda (f)
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(map file (f))))]
|
(map file (f))))]
|
||||||
[wrap-xxxxxxx
|
[wrap-xxxxxxx
|
||||||
(lambda (f)
|
(lambda (file f)
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(map (lambda (s)
|
(map (lambda (s)
|
||||||
(if (file-exists?
|
(if (file-exists?
|
||||||
|
@ -225,18 +228,21 @@
|
||||||
[win-gcc? (append
|
[win-gcc? (append
|
||||||
(if unix?
|
(if unix?
|
||||||
null
|
null
|
||||||
(list (wrap-xxxxxxx (wrap-3m "libmzsch~a~~a.lib"))
|
(list (wrap-xxxxxxx dllfile (wrap-3m "libmzsch~a~~a.dll"))
|
||||||
(wrap-xxxxxxx (drop-3m "libmzgc~a.lib"))))
|
(wrap-xxxxxxx dllfile (drop-3m "libmzgc~a.dll"))))
|
||||||
(list
|
(list
|
||||||
(mzdyn-maybe (filethunk (wrap-3m "mzdyn~a.exp")))
|
(mzdyn-maybe (filethunk (wrap-3m "mzdyn~a.exp")))
|
||||||
(mzdyn-maybe (filethunk (wrap-3m "mzdyn~a.o")))
|
(mzdyn-maybe (filethunk (wrap-3m
|
||||||
|
;; mzdyn.o is for Unix build, mzdynw.o for Windows
|
||||||
|
(format "mzdyn~a~~a.o"
|
||||||
|
(if unix? "" "w")))))
|
||||||
(file "init.o")
|
(file "init.o")
|
||||||
(file "fixup.o")))]
|
(file "fixup.o")))]
|
||||||
[win-borland? (map file (if (current-use-mzdyn)
|
[win-borland? (map file (if (current-use-mzdyn)
|
||||||
(list "mzdynb.obj")
|
(list "mzdynb.obj")
|
||||||
null))]
|
null))]
|
||||||
[else (list (wrap-xxxxxxx (wrap-3m "libmzsch~a~~a.lib"))
|
[else (list (wrap-xxxxxxx file (wrap-3m "libmzsch~a~~a.lib"))
|
||||||
(wrap-xxxxxxx (drop-3m "libmzgc~a.lib"))
|
(wrap-xxxxxxx file (drop-3m "libmzgc~a.lib"))
|
||||||
(mzdyn-maybe (filethunk (wrap-3m "mzdyn~a.exp")))
|
(mzdyn-maybe (filethunk (wrap-3m "mzdyn~a.exp")))
|
||||||
(mzdyn-maybe (filethunk (wrap-3m "mzdyn~a.obj"))))])))
|
(mzdyn-maybe (filethunk (wrap-3m "mzdyn~a.obj"))))])))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user