Changeset 161


Ignore:
Timestamp:
May 9, 2014, 2:35:30 PM (6 years ago)
Author:
Silvan Scherrer
Message:

Qbit fix

File:
1 edited

Legend:

Unmodified
Added
Removed
  • diffs/qbittorrent_3.1.9_GA.diff

    r159 r161  
    11diff -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
    22--- E:\trees\qbittorrent\trunk\..\vendor\current/build_os2.cmd  1970-01-01 01:00:00.000000000 +0100
    3 +++ E:\trees\qbittorrent\trunk/build_os2.cmd    2013-11-28 12:14:02.000000000 +0100
    4 @@ -0,0 +1,290 @@
     3+++ E:\trees\qbittorrent\trunk/build_os2.cmd    2014-05-09 12:17:56.000000000 +0200
     4@@ -0,0 +1,293 @@
    55+/* qbittorrent Build Script */
    66+/* version history */
    77+/* version 0.1.0 from 26.11.2013 Silvan (first edition) */
     8+/* version 0.1.1 from 09.05.2014 Silvan (add message about TORRENT_* defines) */
    89+
    910+/* init the version string (don't forget to change) */
    10 +version = "0.1.0"
    11 +version_date = "26.11.2013"
     11+version = "0.1.1"
     12+version_date = "09.05.2014"
    1213+'@echo off'
    1314+
     
    4445+say "QBittorrent version  :" Qbittorrent_version
    4546+say "            build    :" Qbittorrent_build
     47+say
     48+say "WARNING: TORRENT_* defines in os2conf.pri must match those in libtorrent"
    4649+say
    4750+
     
    395398diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\qbittorrent\trunk\..\vendor\current/os2conf.pri E:\trees\qbittorrent\trunk/os2conf.pri
    396399--- E:\trees\qbittorrent\trunk\..\vendor\current/os2conf.pri    2013-11-05 23:10:18.000000000 +0100
    397 +++ E:\trees\qbittorrent\trunk/os2conf.pri      2013-11-20 11:35:02.000000000 +0100
    398 @@ -7,7 +7,7 @@
     400+++ E:\trees\qbittorrent\trunk/os2conf.pri      2014-05-09 09:43:22.000000000 +0200
     401@@ -7,13 +7,20 @@
    399402         -lboost_thread \
    400403         -lboost_system \
     
    405408 RC_FILE = qbittorrent_os2.rc
    406409 
     410 # LIBTORRENT DEFINES
     411 DEFINES += WITH_SHIPPED_GEOIP_H
     412 DEFINES += BOOST_ASIO_DYN_LINK
     413+DEFINES += TORRENT_USE_OPENSSL
     414+
     415+CONFIG(debug, debug|release) {
     416+  DEFINES += TORRENT_DEBUG
     417+} else {
     418+  DEFINES += NDEBUG
     419+}
     420 
     421 DEFINES += WITH_GEOIP_EMBEDDED
     422 message("On eCS(OS/2), GeoIP database must be embedded.")
Note: See TracChangeset for help on using the changeset viewer.