Fix broken tests.
git-svn-id: svn://10.0.0.236/trunk@12177 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -206,22 +206,6 @@ XFE_STATIC_LIBS += $(XFE_STATIC_CAPTION_LIB)
|
||||
|
||||
endif
|
||||
|
||||
##
|
||||
## XfeComboBox Library
|
||||
##
|
||||
XFE_STATIC_COMBO_BOX_LIB = $(DIST)/lib/libXfeComboBox.a
|
||||
XFE_SHARED_COMBO_BOX_LIB = $(DIST)/bin/libXfeComboBox.$(DLL_SUFFIX)
|
||||
XFE_COMBO_BOX_REQUIRES = XfeComboBox
|
||||
|
||||
##
|
||||
## XfeComboBox required ?
|
||||
##
|
||||
ifeq ($(filter $(REQUIRES),$(XFE_COMBO_BOX_REQUIRES)),$(XFE_COMBO_BOX_REQUIRES))
|
||||
|
||||
XFE_SHARED_LIBS += $(XFE_SHARED_COMBO_BOX_LIB)
|
||||
XFE_STATIC_LIBS += $(XFE_STATIC_COMBO_BOX_LIB)
|
||||
|
||||
endif
|
||||
|
||||
##
|
||||
## Xfe Pref Library
|
||||
@@ -283,6 +267,23 @@ XFE_STATIC_LIBS += $(XFE_STATIC_TOOL_BAR_LIB)
|
||||
|
||||
endif
|
||||
|
||||
##
|
||||
## XfeComboBox Library
|
||||
##
|
||||
XFE_STATIC_COMBO_BOX_LIB = $(DIST)/lib/libXfeComboBox.a
|
||||
XFE_SHARED_COMBO_BOX_LIB = $(DIST)/bin/libXfeComboBox.$(DLL_SUFFIX)
|
||||
XFE_COMBO_BOX_REQUIRES = XfeComboBox
|
||||
|
||||
##
|
||||
## XfeComboBox required ?
|
||||
##
|
||||
ifeq ($(filter $(REQUIRES),$(XFE_COMBO_BOX_REQUIRES)),$(XFE_COMBO_BOX_REQUIRES))
|
||||
|
||||
XFE_SHARED_LIBS += $(XFE_SHARED_COMBO_BOX_LIB)
|
||||
XFE_STATIC_LIBS += $(XFE_STATIC_COMBO_BOX_LIB)
|
||||
|
||||
endif
|
||||
|
||||
##
|
||||
## XfeBm required ?
|
||||
##
|
||||
|
||||
@@ -32,6 +32,7 @@ CSRCS = \
|
||||
REQUIRES = \
|
||||
XfeTest \
|
||||
XfeToolBar \
|
||||
XfeComboBox \
|
||||
XfeBm \
|
||||
XfeWidgets
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@ CSRCS = \
|
||||
REQUIRES = \
|
||||
XfeTest \
|
||||
XfeToolBar \
|
||||
XfeComboBox \
|
||||
XfeBm \
|
||||
XfeWidgets
|
||||
|
||||
|
||||
Reference in New Issue
Block a user