Add patch to remove indirect openssl dependency from Windows build.

This commit is contained in:
lotodore
2011-02-21 23:32:09 +00:00
parent 38b9e764e7
commit 4b0b6a3e03
2 changed files with 52 additions and 4 deletions
+8 -4
View File
@@ -11,7 +11,11 @@ on your Linux system.
(if this does not work, as some packages might be broken, try the latest development release:
hg clone http://hg.savannah.nongnu.org/hgweb/mingw-cross-env mingw )
3. Within /opt/mingw, run
3. Patch OpenSSL dependencies out of Qt build file (OpenSSL license is not compatible with the GPL)
Within /opt/mingw, run
patch -p1 < /path/to/pokerth/docs/win32_rm_openssl.diff
4. Within /opt/mingw, run
make gcc
make qt
make boost
@@ -21,17 +25,17 @@ make sdl_mixer
make tinyxml
(this takes quite some time)
4. As the user you would like to use to compile PokerTH for Windows,
5. As the user you would like to use to compile PokerTH for Windows,
add the cross compiler to your path; e.g.:
PATH="/opt/mingw/usr/bin:$PATH"
(in .profile)
Alternatively, run
export PATH="/opt/mingw/usr/bin:$PATH"
5. Download and extract whichever source version of PokerTH you wish to compile.
6. Download and extract whichever source version of PokerTH you wish to compile.
http://pokerth.net/download.html
6. Within the pokerth directory, run
7. Within the pokerth directory, run
i686-pc-mingw32-qmake DEFINES+=BOOST_THREAD_USE_LIB pokerth.pro
make release
+44
View File
@@ -0,0 +1,44 @@
--- a/src/qt.mk Mon Feb 21 21:18:11 2011 +0100
+++ b/src/qt.mk Tue Feb 22 00:17:48 2011 +0100
@@ -10,7 +10,7 @@
$(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
$(PKG)_WEBSITE := http://qt.nokia.com/
$(PKG)_URL := http://get.qt.nokia.com/qt/source/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl libgcrypt zlib libpng jpeg libmng tiff sqlite libiconv dbus
+$(PKG)_DEPS := gcc libodbc++ freetds libgcrypt zlib libpng jpeg libmng tiff sqlite libiconv dbus
define $(PKG)_UPDATE
wget -q -O- 'http://qt.gitorious.org/qt/qt/commits' | \
@@ -26,8 +26,6 @@
#
# For shared Qt with qt-zlib, add -lQtCore4 to end of OPENSSL_LIBS to satisfy zlib dependency.
cd '$(1)' && \
- OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
- PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \
SYBASE_LIBS="-lsybdb -liconv -lws2_32" \
./configure \
-opensource \
@@ -47,6 +45,7 @@
-no-gstreamer \
-no-phonon \
-no-phonon-backend \
+ -no-openssl \
-accessibility \
-no-reduce-exports \
-no-rpath \
@@ -56,7 +55,6 @@
-nomake examples \
-qt-sql-sqlite \
-qt-sql-odbc \
- -qt-sql-psql \
-qt-sql-tds -D Q_USE_SYBASE \
-system-zlib \
-system-libpng \
@@ -64,7 +62,6 @@
-system-libtiff \
-system-libmng \
-system-sqlite \
- -openssl-linked \
-dbus-linked \
-v