diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more WIN32 compilation fixes.

Browse Source
This commit is contained in:
U-WIN-U2045GN0RNQ\Vítor Santos Costa 2010-07-20 14:33:33 +01:00
parent bf0786822e
commit 18f28354b6
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -6245,7 +6245,11 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
JAVA_HOME="$yap_cv_java"
case "$target_os" in
*cygwin*|*mingw*)
JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib -lpthread"
if test $threads = yes; then
JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib -lpthread"
else
JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib"
fi
JAVAINCPATH="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/win32"
;;
*darwin*)

6
configure.in
View File

@ -724,7 +724,11 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
JAVA_HOME="$yap_cv_java"
case "$target_os" in
*cygwin*|*mingw*)
JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib -lpthread"
if test $threads = yes; then
JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib -lpthread"
else
JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib"
fi
JAVAINCPATH="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/win32"
;;
*darwin*)

2
packages/http/Makefile.in Normal file → Executable file
View File

@ -37,7 +37,7 @@ SO=@SO@
CWD=$(PWD)
#
LD=@DO_SECOND_LD@ @SHLIB_CXX_LD@
LD=@DO_SECOND_LD@ @SHLIB_LD@
LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
BINTARGET=$(DESTDIR)$(YAPLIBDIR)

2
packages/jpl

@ -1 +1 @@
Subproject commit f95f831a3885b53a3b8effd530b986e8cc63386b
Subproject commit 5f1f23e5b57dfbf51f839ed3c9dd813fad2d2dd1

2
packages/semweb/Makefile.in Normal file → Executable file
View File

@ -46,7 +46,7 @@ SO=@SO@
CWD=$(PWD)
#
LD=@DO_SECOND_LD@ @SHLIB_CXX_LD@
LD=@DO_SECOND_LD@ @SHLIB_LD@
LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
BINTARGET=$(DESTDIR)$(YAPLIBDIR)

2
packages/semweb/lock.h Normal file → Executable file
View File

@ -29,7 +29,7 @@
#include <config.h>
#endif
#ifdef __WINDOWS__
#if defined(__WINDOWS__) || defined(__MINGW32__)
#include <windows.h>
#if defined(_REENTRANT) && defined(__WINDOWS__)
enum