Skip to content

Commit 1c63616

Browse files
author
Tobias Junghans
committed
Drop CMake support and implement NSIS deployment
1 parent 3cdf426 commit 1c63616

File tree

11 files changed

+149
-242
lines changed

11 files changed

+149
-242
lines changed

AUTHORS

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
Karl-Heinz Reichel <kh.reichel@techdrivers.de>
2-
Design implementation Modbus TCP part
3-
4-
Tobias Doerffel <tobias.doerffel@gmail.com>
1+
Tobias Junghans <totimaju@gmail.com>
52
Project manager
63

7-
4+
Karl-Heinz Reichel <kh.reichel@techdrivers.de>
5+
Design implementation Modbus TCP part

CMakeLists.txt

Lines changed: 0 additions & 156 deletions
This file was deleted.

README

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
QModBusTcp
22
==========
33
Copyright (c) 2013 Karl-Heinz Reichel, ing-büro reichel-langer
4-
Copyright (c) 2009-2011 Tobias Doerffel, EDC Electronic Design Chemnitz GmbH
4+
Copyright (c) 2009-2018 Tobias Junghans, EDC Electronic Design Chemnitz GmbH
55

66
http://www.techdrivers.de
77
http://www.ed-chemnitz.de
@@ -38,7 +38,7 @@ traffic on the bus.
3838
Requirements
3939
------------
4040

41-
* Qt4
41+
* Qt5
4242
* GCC
4343

4444

@@ -54,5 +54,5 @@ Contact
5454
-------
5555

5656
Any suggestions, patches etc. are welcome. Simply send a mail to
57-
tobias.doerffel (at) gmail (dot) com or
57+
totimaju (at) gmail (dot) com or
5858
kh.reichel@techdrives.de.

build_mingw32

Lines changed: 0 additions & 4 deletions
This file was deleted.

cmake/MinGWCrossCompile.cmake

Lines changed: 0 additions & 35 deletions
This file was deleted.

cmake/Win32Toolchain-Native.cmake

Lines changed: 0 additions & 25 deletions
This file was deleted.

cmake/Win32Toolchain.cmake

Lines changed: 0 additions & 6 deletions
This file was deleted.

deployment.pri

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
win32 {
2+
dlls.path = $$PREFIX
3+
qt5platforms.path = $${dlls.path}/platforms
4+
5+
MAIN_DLLS=Qt5Core Qt5Gui Qt5Widgets libpng16-16
6+
for(dll, MAIN_DLLS): dlls.files += $$[QT_INSTALL_BINS]/$${dll}.dll
7+
8+
dlls.files += /usr/x86_64-w64-mingw32/lib/zlib1.dll
9+
dlls.files += /usr/lib/gcc/x86_64-w64-mingw32/6.3-win32/libstdc++-6.dll
10+
dlls.files += /usr/lib/gcc/x86_64-w64-mingw32/6.3-win32/libgcc_s_seh-1.dll
11+
12+
# add required Qt plugin DLLs
13+
qt5platforms.files += $$[QT_INSTALL_PLUGINS]/platforms/qwindows.dll
14+
15+
INSTALLS += dlls qt5platforms
16+
}
17+
18+
target.path = $$PREFIX
19+
20+
INSTALLS += target

0 commit comments

Comments
 (0)