儲存庫 kBuild 的更動 1756

時間撮記:

2008-9-6 上午06:31:34 (16 年 以前)

作者:

bird

訊息:

qt3: location guessing, windows fix.

檔案:

• trunk/kBuild/units/qt3.kmk (修改) (4 筆差異)

trunk/kBuild/units/qt3.kmk

@@ -73 +73 @@
         $(PATH_SDK_QT3)/lib32/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib32/qt3/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib32/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         /usr/lib32/libqt-mt$(SUFF_DLL) \
         /usr/lib32/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/lib32/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         /usr/local/lib32/libqt-mt$(SUFF_DLL) \
         /usr/local/lib32/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib32/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         )))
      endif
@@ -85 +89 @@
         $(PATH_SDK_QT3)/lib64/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib64/qt3/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib64/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/amd64/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/64/libqt-mt$(SUFF_DLL) \
         /usr/lib64/libqt-mt$(SUFF_DLL) \
         /usr/lib64/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/lib64/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         /usr/lib/amd64/libqt-mt$(SUFF_DLL) \
+        /usr/lib/64/libqt-mt$(SUFF_DLL) \
         /usr/local/lib64/libqt-mt$(SUFF_DLL) \
         /usr/local/lib64/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib64/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         /usr/local/lib/amd64/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib/64/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         )))
      endif
@@ -102 +113 @@
         $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         /usr/lib/libqt-mt$(SUFF_DLL) \
         /usr/lib/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/lib/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         /usr/local/lib/libqt-mt$(SUFF_DLL) \
         /usr/local/lib/qt3/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib/qt3-3/lib/libqt-mt$(SUFF_DLL) \
         )))
       endif
@@ -660 +674 @@
         $($(target)_QT_PREFIX))
 ifeq ($(bld_trg),win)
- $(eval $(target)_LIBS    += $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt$(SUFF_LIB)) )
+ local qt_lib := $(firstword $(wildcard \
+        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)qt-mt3$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt3$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)qt-mt$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)Qt3$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/$(qt_prefix)Qt3$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/dynamic/$(qt_prefix)Qt$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/$(qt_prefix)Qt$(SUFF_LIB) \
+        ) $(PATH_SDK_QT3_LIB)/$(qt_prefix)qt-mt$(SUFF_LIB) )
+ $(eval $(target)_LIBS    += $(qt_lib) )
  ifeq ($(tool_do),LINK_PROGRAM)
-  $(eval $(target)_LIBS   += $(PATH_SDK_QT3_LIB)/$(qt_prefix)qtmain$(SUFF_LIB) )
+  local qt_main_lib := $(firstword $(wildcard \
+        $(PATH_SDK_QT3_LIB)/$(qt_prefix)qtmain$(SUFF_LIB) \
+        $(PATH_SDK_QT3_LIB)/qtmain$(SUFF_LIB)
+        ) $(PATH_SDK_QT3_LIB)/$(qt_prefix)qtmain$(SUFF_LIB) )
+  $(eval $(target)_LIBS   += $(qt_main_lib) )
  endif
 else