Add QT_VERSION to default value of RABBIT_BUILD_PREFIX

fgzhanhao · Nov 18, 2017 · 27252b4 · 27252b4
1 parent 374203e
commit 27252b4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/ThirdLibrary b/ThirdLibrary
diff --git a/pri/ThirdLibraryConfig.pri b/pri/ThirdLibraryConfig.pri
@@ -57,9 +57,8 @@ win32 {
     RABBITIM_PLATFORM = "android"
     RABBITIM_ARCH = $${ANDROID_ARCHITECTURE}
     DEFINES += ANDROID MOBILE
-
-}  else:unix {
 
+}  else:unix {
     RABBITIM_SYSTEM = unix
     RABBITIM_PLATFORM = unix
     DEFINES += UNIX
@@ -69,9 +68,18 @@ win32 {
     }else {
         RABBITIM_ARCH = "x86"
     }
+
+}
+
+isEmpty(RABBIT_CONFIG) {
+    CONFIG(debug, debug|release) {
+        RABBIT_CONFIG=Debug
+    } else {
+        RABBIT_CONFIG=Release
+    }
 }
 
-isEmpty(THIRD_LIBRARY_PATH) : THIRD_LIBRARY_PATH = $$PWD/../ThirdLibrary/$${RABBITIM_PLATFORM}$${RABBIT_TOOLCHAIN_VERSION}_$${RABBITIM_ARCH}
+isEmpty(THIRD_LIBRARY_PATH) : THIRD_LIBRARY_PATH = $$PWD/../ThirdLibrary/$${RABBITIM_PLATFORM}$${RABBIT_TOOLCHAIN_VERSION}_$${RABBITIM_ARCH}_qt$${QT_VERSION}_$${RABBIT_CONFIG}
 
 CONFIG(static, static|shared) {
     DEFINES += RABBITIM_STATIC
+4 −5		INSTALL_ANDROID.md
+2 −3		INSTALL_UBUNTU.md
+3 −4		INSTALL_WINDOWS.md
+50 −3		appveyor.yml
+3 −1		build_script/build.sh
+3 −5		build_script/build_OsgQt.sh
+8 −7		build_script/build_envsetup_android.sh
+8 −3		build_script/build_envsetup_unix.sh
+25 −6		build_script/build_envsetup_windows_mingw.sh
+10 −6		build_script/build_envsetup_windows_msvc.sh
+2 −6		build_script/build_expat.sh
+5 −0		build_script/build_ffmpeg.sh
+1 −1		build_script/build_freetype.sh
+7 −1		build_script/build_libcurl.sh
+1 −1		build_script/build_libgpx.sh
+5 −5		build_script/build_libqrencode.sh
+25 −18		build_script/build_libsodium.sh
+3 −1		build_script/build_libtiff.sh
+1 −1		build_script/build_libyuv.sh
+4 −4		build_script/build_minizip.sh
+1 −5		build_script/build_opencv.sh
+1 −4		build_script/build_osg.sh
+2 −4		build_script/build_osgearth.sh
+2 −11		build_script/build_qxmpp.sh
+2 −10		build_script/build_qzxing.sh
+3 −6		build_script/build_rabbitim.sh
+3 −1		build_script/build_zlib.sh