Merge pull request #263 from jonleighton/breakpad

Compile the breakpad client in directly.
1.6
Ariya Hidayat 2012-06-12 07:24:34 -07:00
commit cd65c63af1
2 changed files with 16 additions and 6 deletions

View File

@ -48,10 +48,6 @@ until [ -z "$1" ]; do
esac
done
if [[ $OSTYPE = linux* ]]; then
cd src/breakpad && ./configure && make && cd ../..
fi
cd src/qt && ./preconfig.sh --jobs $COMPILE_JOBS --qt-config "$QT_CFG" && cd ../..
src/qt/bin/qmake
make -j$COMPILE_JOBS

View File

@ -59,8 +59,22 @@ include(mongoose/mongoose.pri)
include(linenoise/linenoise.pri)
linux* {
INCLUDEPATH += $$PWD/breakpad/src
LIBS += $$PWD/breakpad/src/client/linux/libbreakpad_client.a
INCLUDEPATH += breakpad/src
SOURCES += breakpad/src/client/linux/crash_generation/crash_generation_client.cc \
breakpad/src/client/linux/handler/exception_handler.cc \
breakpad/src/client/linux/log/log.cc \
breakpad/src/client/linux/minidump_writer/linux_dumper.cc \
breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc \
breakpad/src/client/linux/minidump_writer/minidump_writer.cc \
breakpad/src/client/minidump_file_writer.cc \
breakpad/src/common/convert_UTF.c \
breakpad/src/common/md5.cc \
breakpad/src/common/string_conversion.cc \
breakpad/src/common/linux/file_id.cc \
breakpad/src/common/linux/guid_creator.cc \
breakpad/src/common/linux/memory_mapped_file.cc \
breakpad/src/common/linux/safe_readlink.cc
}
win32: RC_FILE = phantomjs_win.rc