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:
26
26
- ./../bin/tests/tests -platform minimal -txt
27
27
- ./../bin/tests/qml_tests -platform minimal -txt
28
28
- cd ./../src
29
- - python ./../build/set_version.py 1.0.0 > version.h
30
29
- sudo chmod a+x configure
31
30
- ./configure
32
31
- qmake
Original file line number Diff line number Diff line change @@ -20,7 +20,6 @@ INCLUDEPATH += $$BREAKPADDIR/src
20
20
DEPENDPATH += $$PWD /libssh2/include
21
21
DEPENDPATH += $$BREAKPADDIR
22
22
23
- # win32-msvc* {
24
23
win32 * {
25
24
CONFIG (release , debug |release ) {
26
25
WIN_DEPS_PATH = $$PWD /libs/win32/release/
@@ -81,6 +80,9 @@ unix:!macx { # ubuntu & debian
81
80
82
81
QMAKE_CXXFLAGS += -std =gnu ++0x -g # workaround for google breakpad
83
82
83
+ # clean default flags
84
+ QMAKE_LFLAGS_RPATH =
85
+
84
86
LIBS += -Wl ,-rpath =\ \\$$ORIGIN/../lib # don't remove!!!
85
87
LIBS += /usr/local/lib/libssh2.a
86
88
LIBS += -lcrypto -lz
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ TEMPLATE = app
12
12
# Skip version file
13
13
!exists ( $$PWD/version.h ) {
14
14
DEFINES += RDM_VERSION =\ \\"0.8.0.0\\\"
15
+ message (" Version: 0.8.0.0" )
15
16
}
16
17
17
18
DEFINES += ELPP_QT_LOGGING ELPP_STL_LOGGING
@@ -33,7 +34,6 @@ SOURCES += \
33
34
$$PWD /modules/updater/ *.cpp \
34
35
35
36
HEADERS += \
36
- $$PWD /version.h \
37
37
$$PWD /app/dialogs/ *.h \
38
38
$$PWD /app/models/ *.h \
39
39
$$PWD /app/models/key-models/ *.h \
@@ -95,7 +95,6 @@ unix:!macx { # ubuntu & debian
95
95
CONFIG += static release
96
96
CONFIG -= debug
97
97
98
- # Qt static linked on Ubuntu/Debian
99
98
QMAKE_LFLAGS += -static-libgcc -static-libstdc ++
100
99
101
100
release : DESTDIR = ./../bin/linux/release
You can’t perform that action at this time.
0 commit comments