Changeset 161 for diffs/qbittorrent_3.1.9_GA.diff

Timestamp:

May 9, 2014, 4:35:30 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Qbit fix

File:

• diffs/qbittorrent_3.1.9_GA.diff (modified) (4 diffs)

diffs/qbittorrent_3.1.9_GA.diff

@@ -1 +1 @@
 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\qbittorrent\trunk\..\vendor\current/build_os2.cmd E:\trees\qbittorrent\trunk/build_os2.cmd
 --- E:\trees\qbittorrent\trunk\..\vendor\current/build_os2.cmd  1970-01-01 01:00:00.000000000 +0100
-+++ E:\trees\qbittorrent\trunk/build_os2.cmd    2013-11-28 12:14:02.000000000 +0100
-@@ -0,0 +1,290 @@
++++ E:\trees\qbittorrent\trunk/build_os2.cmd    2014-05-09 12:17:56.000000000 +0200
+@@ -0,0 +1,293 @@
 +/* qbittorrent Build Script */
 +/* version history */
 +/* version 0.1.0 from 26.11.2013 Silvan (first edition) */
++/* version 0.1.1 from 09.05.2014 Silvan (add message about TORRENT_* defines) */
 +
 +/* init the version string (don't forget to change) */
-+version = "0.1.0"
-+version_date = "26.11.2013"
++version = "0.1.1"
++version_date = "09.05.2014"
 +'@echo off'
 +
@@ -44 +45 @@
 +say "QBittorrent version  :" Qbittorrent_version
 +say "            build    :" Qbittorrent_build 
++say
++say "WARNING: TORRENT_* defines in os2conf.pri must match those in libtorrent"
 +say
 +
@@ -395 +398 @@
 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\qbittorrent\trunk\..\vendor\current/os2conf.pri E:\trees\qbittorrent\trunk/os2conf.pri
 --- E:\trees\qbittorrent\trunk\..\vendor\current/os2conf.pri    2013-11-05 23:10:18.000000000 +0100
-+++ E:\trees\qbittorrent\trunk/os2conf.pri      2013-11-20 11:35:02.000000000 +0100
-@@ -7,7 +7,7 @@
++++ E:\trees\qbittorrent\trunk/os2conf.pri      2014-05-09 09:43:22.000000000 +0200
+@@ -7,13 +7,20 @@
          -lboost_thread \
          -lboost_system \
@@ -405 +408 @@
  RC_FILE = qbittorrent_os2.rc
  
+ # LIBTORRENT DEFINES
+ DEFINES += WITH_SHIPPED_GEOIP_H
+ DEFINES += BOOST_ASIO_DYN_LINK
++DEFINES += TORRENT_USE_OPENSSL
++
++CONFIG(debug, debug|release) {
++  DEFINES += TORRENT_DEBUG
++} else {
++  DEFINES += NDEBUG
++}
+ 
+ DEFINES += WITH_GEOIP_EMBEDDED
+ message("On eCS(OS/2), GeoIP database must be embedded.")