diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-07 12:56:46 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-07 12:56:46 (GMT) |
commit | 9629ef3f969e31dfd19efa27e62487fc46610416 (patch) | |
tree | 5e8e260de55b4e65dd49f2d81d2fc61b46844224 /contrib | |
parent | 0388c7ac478187ff8d264b6e0275a4c4a43796b9 (diff) | |
download | uscxml-9629ef3f969e31dfd19efa27e62487fc46610416.zip uscxml-9629ef3f969e31dfd19efa27e62487fc46610416.tar.gz uscxml-9629ef3f969e31dfd19efa27e62487fc46610416.tar.bz2 |
Fixes for the Prolog datamodel
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/build-scripts/build-swi-macosx.sh | 14 | ||||
-rw-r--r-- | contrib/build-scripts/pidgin-configure | 1 | ||||
-rw-r--r-- | contrib/cmake/FindSWI.cmake | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/contrib/build-scripts/build-swi-macosx.sh b/contrib/build-scripts/build-swi-macosx.sh index b2618cc..42e0a51 100755 --- a/contrib/build-scripts/build-swi-macosx.sh +++ b/contrib/build-scripts/build-swi-macosx.sh @@ -29,13 +29,21 @@ if [ -f Makefile ]; then make clean fi +if [ ${MACOSX_COMP[1]} -lt 9 ]; then + export CXXFLAGS="-mmacosx-version-min=10.6 -stdlib=libstdc++ -arch x86_64 -arch i386" + export CFLAGS="-mmacosx-version-min=10.6 -arch x86_64 -arch i386" + export LDFLAGS="-stdlib=libstdc++" +else + export CXXFLAGS="-mmacosx-version-min=10.7 -stdlib=libc++ -arch x86_64 -arch i386" + export CFLAGS="-mmacosx-version-min=10.7 -stdlib=libc++ -arch x86_64 -arch i386" + export LDFLAGS="-stdlib=libc++" +fi + #CPPFLAGS="-DHAVE_CURSES_H=0 -DHAVE_TGETENT=0 -DHAVE_TCSETATTR=0 -DHAVE_TERM_H=0 -DHAVE_LIBNCURSES=0" \ ./configure \ -CFLAGS="-mmacosx-version-min=10.6 -arch x86_64 -arch i386" \ -CXXFLAGS="-mmacosx-version-min=10.6 -arch x86_64 -arch i386" \ -LDFLAGS="-mmacosx-version-min=10.6 -arch x86_64 -arch i386" \ --disable-gmp --disable-readline \ +--without-jpl \ --prefix=${DEST_DIR} sed -ie 's/define HAVE_CURSES_H 1/undef HAVE_CURSES_H/' config.h diff --git a/contrib/build-scripts/pidgin-configure b/contrib/build-scripts/pidgin-configure new file mode 100644 index 0000000..34a9ffe --- /dev/null +++ b/contrib/build-scripts/pidgin-configure @@ -0,0 +1 @@ +./configure --disable-nls --disable-gtkui --disable-consoleui --disable-gstreamer --disable-vv --disable-meanwhile --disable-avahi --disable-dbus --disable-gnome-keyring --disable-kwallet --disable-nss --disable-gnutls --disable-tcl --disable-perl --disable-tk --enable-static --with-pic
\ No newline at end of file diff --git a/contrib/cmake/FindSWI.cmake b/contrib/cmake/FindSWI.cmake index acea32c..cb4d8b3 100644 --- a/contrib/cmake/FindSWI.cmake +++ b/contrib/cmake/FindSWI.cmake @@ -8,7 +8,7 @@ if (UNIX) if (APPLE AND 64BIT_HOST) set(SWI_PLATFORM_ID "x86_64-${CMAKE_SYSTEM_NAME}${CMAKE_SYSTEM_VERSION}") else() - set(SWI_PLATFORM_ID "${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}${CMAKE_SYSTEM_VERSION}") + set(SWI_PLATFORM_ID "${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}") endif() else() set(SWI_PLATFORM_ID "${CMAKE_SYSTEM_PROCESSOR}-windows") |