libraries/proxyface
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

proxy works for @73, but not for @84, undo [74] - [84]; refs #17

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-06-03 06:01:15 +00:00
parent 7904ef63de
commit 14cc3fc7ee
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@@ -42,7 +42,7 @@ AC_SUBST(LEAST)
AC_MSG_CHECKING(QT4 directory) AC_MSG_CHECKING(QT4 directory)
QTDIR="no" QTDIR="no"
AC_ARG_WITH([qt-dir], AC_ARG_WITH([qt-dir],
AC_HELP_STRING([--with-qt-dir=/path/to/Qt4/include], AC_HELP_STRING([--with-qt-dir=/path/to/Qt4],
[to specify the path to the Qt4 directory.]), [to specify the path to the Qt4 directory.]),
[QTPATHS="$withval"], [QTPATHS="$withval"],
[QTPATHS="/usr/include/qt4 /usr/local/include/qt4 /opt/include/qt4 /opt/local/include/qt4 /opt/local/libexec/qt4-mac/include /usr/include /usr/local/include /opt/include /opt/local/include"]) [QTPATHS="/usr/include/qt4 /usr/local/include/qt4 /opt/include/qt4 /opt/local/include/qt4 /opt/local/libexec/qt4-mac/include /usr/include /usr/local/include /opt/include /opt/local/include"])
@@ -75,18 +75,14 @@ else
# by now, Linux/Unix always uses libproxy # by now, Linux/Unix always uses libproxy
case $host in case $host in
*darwin*) *darwin*)
CPPFLAGS+=" -DQ_OS_MAC -F$QTINCDIR" LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui"
#LDFLAGS+=" -F$QTLIBDIR -framework QtCore -framework QtNetwork -framework QtGui"
LDFLAGS+=" -F$QTLIBDIR -L/opt/local/lib -lQtCore -lQtNetwork -lQtGui"
;; ;;
*mingw*|*win*) *mingw*|*win*)
LDFLAGS+=" -L$QTLIBDIR -lQtCore4 -lQtNetwork4 -lQtGui4" LDFLAGS+=" -L$QTLIBDIR -lQtCore4 -lQtNetwork4 -lQtGui4"
CPPFLAGS+=" -DQ_OS_WIN32"
;; ;;
*) *)
LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui" LDFLAGS+=" -L$QTLIBDIR -lQtCore -lQtNetwork -lQtGui"
LDFLAGS+=" -lproxy" LDFLAGS+=" -lproxy"
CPPFLAGS+=" -DQ_OS_LINUX"
;; ;;
esac esac
CPPFLAGS+=" -DUNICODE -DQT_NO_DEBUG" CPPFLAGS+=" -DUNICODE -DQT_NO_DEBUG"

25
install-32-bit-lin-win.sh
View File

@@ -1,14 +1,13 @@
./bootstrap.sh && \ ./bootstrap.sh && \
LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \ LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \ CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \
./configure \ ./configure \
--with-qt-dir=/usr/local/trolltech/qt-mingw32/include \ --prefix=/opt/local/i586-mingw32msvc \
--prefix=/opt/local/i586-mingw32msvc \ --build=x86_64 \
--build=x86_64 \ --host=i586-mingw32msvc && \
--host=i586-mingw32msvc && \ make && \
make && \ sudo make install && \
sudo make install && \ make clean && \
make clean && \ ./configure && \
./configure --with-qt-dir=/usr/local/trolltech/qt/include && \ make check && \
make check && \ sudo make install
sudo make install

2
install-64-and-32-bit-linux.sh
View File

@@ -7,7 +7,7 @@ make && \
sudo make install && \ sudo make install && \
make clean && \ make clean && \
LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \ LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
CPPFLAGS="-I/opt/local/i586-mingw32msvc/include" \ CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \
./configure \ ./configure \
--prefix=/opt/local/i586-mingw32msvc \ --prefix=/opt/local/i586-mingw32msvc \
--build=x86_64 \ --build=x86_64 \