Restructured the project file

Move OS specific configuration to separate project files
Evengard · Nov 20, 2010 · 8a1e79d · 8a1e79d
1 parent 1ca0840
commit 8a1e79d
Show file tree

Hide file tree

Showing 34 changed files with 301 additions and 320 deletions.
diff --git a/configure b/configure
@@ -338,7 +338,7 @@ public:
 	bool exec()
 	{
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addDefine("DISABLE_GUI");
+			conf->addExtra("CONFIG += nox");
 		}	
 		return(QT_VERSION >= 0x040500);
 	}

diff --git a/macxconf.pri b/macxconf.pri
@@ -0,0 +1,16 @@
+PREFIX = /usr/local
+BINDIR = /usr/local/bin
+DATADIR = /usr/local/share
+
+INCLUDEPATH += /usr/local/include/libtorrent /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
+LIBS += -ltorrent-rasterbar -lcrypto -L/opt/local/lib -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -framework Cocoa -framework Carbon
+
+document_icon.path = Contents/Resources
+document_icon.files = Icons/qBitTorrentDocument.icns
+
+QMAKE_BUNDLE_DATA += document_icon
+ICON = Icons/qbittorrent_mac.icns
+QMAKE_INFO_PLIST = Info.plist
+
+DEFINES += WITH_GEOIP_EMBEDDED
+message("On Mac OS X, GeoIP database must be embedded.")
diff --git a/os2conf.pri b/os2conf.pri
@@ -0,0 +1,10 @@
+LIBS += -ltorrent-rasterbar \
+        -lboost_thread \
+        -lboost_system \
+        -lboost_filesystem \
+        -lssl -lcrypto -lidn -lpthread
+
+RC_FILE = qbittorrent_os2.rc
+
+DEFINES += WITH_GEOIP_EMBEDDED
+message("On eCS(OS/2), GeoIP database must be embedded.")
diff --git a/qcm/qt4.qcm b/qcm/qt4.qcm
@@ -13,7 +13,7 @@ public:
 	bool exec()
 	{
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addDefine("DISABLE_GUI");
+			conf->addExtra("CONFIG += nox");
 		}	
 		return(QT_VERSION >= 0x040500);
 	}

diff --git a/src/ui/about.ui → src/about.ui b/src/ui/about.ui → src/about.ui
diff --git a/src/ui/bandwidth_limit.ui → src/bandwidth_limit.ui b/src/ui/bandwidth_limit.ui → src/bandwidth_limit.ui
diff --git a/src/ui/confirmdeletiondlg.ui → src/confirmdeletiondlg.ui b/src/ui/confirmdeletiondlg.ui → src/confirmdeletiondlg.ui
diff --git a/src/ui/console.ui → src/console.ui b/src/ui/console.ui → src/console.ui
diff --git a/src/ui/downloadfromurldlg.ui → src/downloadfromurldlg.ui b/src/ui/downloadfromurldlg.ui → src/downloadfromurldlg.ui
diff --git a/src/geoip.qrc b/src/geoip.qrc
diff --git a/src/geoip/geoip.pri b/src/geoip/geoip.pri
@@ -0,0 +1,19 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += $$PWD/geoipmanager.h
+
+SOURCES += $$PWD/geoipmanager.cpp
+
+# Add GeoIP resource file if the GeoIP database
+# should be embedded in qBittorrent executable
+contains(DEFINES, WITH_GEOIP_EMBEDDED) {
+  exists("geoip/GeoIP.dat") {
+    message("GeoIP.dat was found in src/geoip/.")
+    RESOURCES += $$PWD/geoip.qrc
+  } else {
+    DEFINES -= WITH_GEOIP_EMBEDDED
+    error("GeoIP.dat was not found in src/geoip/ folder, please follow instructions in src/geoip/README.")
+  }
+} else {
+  message("GeoIP database will not be embedded in qBittorrent executable.")
+}
diff --git a/src/geoip/geoip.qrc b/src/geoip/geoip.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/geoip">
+        <file>GeoIP.dat</file>
+    </qresource>
+</RCC>
diff --git a/src/geoipmanager.cpp → src/geoip/geoipmanager.cpp b/src/geoipmanager.cpp → src/geoip/geoipmanager.cpp
diff --git a/src/geoipmanager.h → src/geoip/geoipmanager.h b/src/geoipmanager.h → src/geoip/geoipmanager.h
diff --git a/src/ui/login.ui → src/login.ui b/src/ui/login.ui → src/login.ui
diff --git a/src/ui/mainwindow.ui → src/mainwindow.ui b/src/ui/mainwindow.ui → src/mainwindow.ui
diff --git a/src/advancedsettings.h → src/preferences/advancedsettings.h b/src/advancedsettings.h → src/preferences/advancedsettings.h
diff --git a/src/ui/options.ui → src/preferences/options.ui b/src/ui/options.ui → src/preferences/options.ui
diff --git a/src/options_imp.cpp → src/preferences/options_imp.cpp b/src/options_imp.cpp → src/preferences/options_imp.cpp
diff --git a/src/options_imp.h → src/preferences/options_imp.h b/src/options_imp.h → src/preferences/options_imp.h
diff --git a/src/preferences.h → src/preferences/preferences.h b/src/preferences.h → src/preferences/preferences.h
diff --git a/src/preferences/preferences.pri b/src/preferences/preferences.pri
@@ -0,0 +1,13 @@
+INCLUDEPATH += $$PWD
+
+!contains(DEFINES, DISABLE_GUI) {
+
+  HEADERS += $$PWD/options_imp.h \
+             $$PWD/advancedsettings.h
+
+  SOURCES += $$PWD/options_imp.cpp
+
+  FORMS += $$PWD/options.ui
+}
+
+HEADERS += $$PWD/preferences.h
diff --git a/src/ui/preview.ui → src/preview.ui b/src/ui/preview.ui → src/preview.ui
diff --git a/src/ui/peer.ui → src/properties/peer.ui b/src/ui/peer.ui → src/properties/peer.ui
diff --git a/src/properties/properties.pri b/src/properties/properties.pri
@@ -1,6 +1,8 @@
 INCLUDEPATH += $$PWD
 
-FORMS += $$PWD/propertieswidget.ui
+FORMS += $$PWD/propertieswidget.ui \
+         $$PWD/trackersadditiondlg.ui \
+         $$PWD/peer.ui
 
 HEADERS += $$PWD/propertieswidget.h \
              $$PWD/peerlistwidget.h \

diff --git a/src/ui/trackersadditiondlg.ui → src/properties/trackersadditiondlg.ui b/src/ui/trackersadditiondlg.ui → src/properties/trackersadditiondlg.ui
diff --git a/src/ui/pluginsource.ui → src/searchengine/pluginsource.ui b/src/ui/pluginsource.ui → src/searchengine/pluginsource.ui
diff --git a/src/searchengine/searchengine.pri b/src/searchengine/searchengine.pri
@@ -1,7 +1,8 @@
 INCLUDEPATH += $$PWD
 
 FORMS += $$PWD/search.ui \
-         $$PWD/engineselect.ui
+         $$PWD/engineselect.ui \
+         $$PWD/pluginsource.ui
 
 HEADERS += $$PWD/searchengine.h \
            $$PWD/searchtab.h \