subsurface.git/smtk-import, branch v4.7.1

smtk-import: partially revert and complete 6963b52d

2017-06-22T01:40:04Z

6963b52d introduced a cmake option, COMMANDLINE to enable building a pure command line version of smtk2ssrf importer, but then the #define COMMANDLINE=1 forces building CLI mode. This patch allows building GUI or CLI versions depending on selection of the COMMANDLINE option. Signed-off-by: Salvador Cuñat

smtk-import portability: avoid using %m[] in sscanf

2017-06-11T20:50:59Z

As Lubomir pointed out in his patch for datatrak.c, the format option %m for sscanf doesn't work in mingw/windows. Fortunately it's unnecessary as dates are dropped and we just get times. Signed-off-by: Salvador Cuñat

smtk-import: portability: rework non portable funcs

2017-06-11T20:50:59Z

For different reasons some used functions aren't portable or simply are not included in mingw. This includes index, rindex, strptime, and timegm. A workaround for this is needed, if we want to build for windows using mingw based mxe environment. This patch does: - drops index and rindex in favor of strchr and strrchr - substitute strptime with a sscanf parsing - emulate timegm with a private func smtk_timegm() - remove definitions needed by strptime Signed-off-by: Salvador Cuñat

smtk-import: portability: rename DATE

2017-06-11T20:50:59Z

DATE happens to be defined in wtypes.h. Redefining it may be a bad idea, so move it to _DATE Signed-off-by: Salvador Cuñat

smtk-import: portability: include windows.h

2017-06-11T20:50:59Z

Include windows.h if we are cross building to windows Signed-off-by: Salvador Cuñat

Let command line version not open an X window

2017-06-11T20:50:30Z

So we can run it on a headless system Signed-off-by: Robert C. Helling

smtk-import: add cmake modules and .nsi skeleton

2017-06-11T20:50:30Z

Needed to crossbuild to windows. The cmake modules are just clones from those under subsurface/cmake/Modules, tweaked to build smtk-import for windows.

smtk-import: change CMakeLists.txt

2017-06-11T20:50:30Z

As SmartTrak importer is building separately from Subsurface, a full CMakeLists.txt file is necessary for the smtk-import directory. It includes cross building to windows capability.

Add SPDX header to smartrak importer

2017-04-29T20:32:55Z

Signed-off-by: Dirk Hohndel

smtk-import: Add curly braces in nested conditionals

2017-04-21T13:52:13Z

Curly braces are necessary in nested conditionals or results may not be those expected. In this case, the "else" clause applied on second "if", instead of first one. Signed-off-by: Salvador Cuñat