File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -26,7 +26,6 @@ script:
2626 - ./../bin/tests/tests -platform minimal -txt
2727 - ./../bin/tests/qml_tests -platform minimal -txt
2828 - cd ./../src
29- - python ./../build/set_version.py 1.0.0 > version.h
3029 - sudo chmod a+x configure
3130 - ./configure
3231 - qmake
Original file line number Diff line number Diff line change @@ -20,7 +20,6 @@ INCLUDEPATH += $$BREAKPADDIR/src
2020DEPENDPATH += $$PWD /libssh2/include
2121DEPENDPATH += $$BREAKPADDIR
2222
23- # win32-msvc* {
2423win32 * {
2524 CONFIG (release , debug |release ) {
2625 WIN_DEPS_PATH = $$PWD /libs/win32/release/
@@ -81,6 +80,9 @@ unix:!macx { # ubuntu & debian
8180
8281 QMAKE_CXXFLAGS += -std =gnu ++0x -g # workaround for google breakpad
8382
83+ # clean default flags
84+ QMAKE_LFLAGS_RPATH =
85+
8486 LIBS += -Wl ,-rpath =\ \\$$ORIGIN/../lib # don't remove!!!
8587 LIBS += /usr/local/lib/libssh2.a
8688 LIBS += -lcrypto -lz
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ TEMPLATE = app
1212# Skip version file
1313!exists ( $$PWD/version.h ) {
1414 DEFINES += RDM_VERSION =\ \\"0.8.0.0\\\"
15+ message (" Version: 0.8.0.0" )
1516}
1617
1718DEFINES += ELPP_QT_LOGGING ELPP_STL_LOGGING
@@ -33,7 +34,6 @@ SOURCES += \
3334 $$PWD /modules/updater/ *.cpp \
3435
3536HEADERS += \
36- $$PWD /version.h \
3737 $$PWD /app/dialogs/ *.h \
3838 $$PWD /app/models/ *.h \
3939 $$PWD /app/models/key-models/ *.h \
@@ -95,7 +95,6 @@ unix:!macx { # ubuntu & debian
9595 CONFIG += static release
9696 CONFIG -= debug
9797
98- # Qt static linked on Ubuntu/Debian
9998 QMAKE_LFLAGS += -static-libgcc -static-libstdc ++
10099
101100 release : DESTDIR = ./../bin/linux/release
You can’t perform that action at this time.
0 commit comments