Bug 484161 - Qt breaks with enable-test in updater/test. r=rstrong
This commit is contained in:
Родитель
3cafa48537
Коммит
780789d465
|
@ -48,6 +48,7 @@ CPPSRCS = \
|
|||
updater.cpp \
|
||||
bspatch.cpp \
|
||||
archivereader.cpp \
|
||||
readstrings.cpp \
|
||||
$(NULL)
|
||||
|
||||
PROGRAM = updater$(BIN_SUFFIX)
|
||||
|
@ -68,7 +69,6 @@ HAVE_PROGRESSUI = 1
|
|||
RCINCLUDE = updater.rc
|
||||
CPPSRCS += \
|
||||
progressui_win.cpp \
|
||||
readstrings.cpp \
|
||||
$(NULL)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32)
|
||||
DEFINES += -DUNICODE -D_UNICODE
|
||||
|
@ -83,7 +83,6 @@ ifneq ($(MOZ_ENABLE_GTK2),)
|
|||
HAVE_PROGRESSUI = 1
|
||||
CPPSRCS += \
|
||||
progressui_gtk.cpp \
|
||||
readstrings.cpp \
|
||||
$(NULL)
|
||||
OS_CXXFLAGS += $(TK_CFLAGS)
|
||||
OS_LIBS += $(TK_LIBS)
|
||||
|
@ -91,17 +90,10 @@ endif
|
|||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
HAVE_PROGRESSUI = 1
|
||||
CPPSRCS += readstrings.cpp
|
||||
CMMSRCS += progressui_osx.mm launchchild_osx.mm
|
||||
OS_LIBS += -framework Cocoa
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
CPPSRCS += \
|
||||
readstrings.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifndef HAVE_PROGRESSUI
|
||||
CPPSRCS += progressui_null.cpp
|
||||
endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче