Merge branch 'feature/upstream' into develop

7 files changed, 179 insertions, 0 deletions

diff --git a/app/bin/CMakeFiles/xtrkcad.dir/DependInfo.cmake b/app/bin/CMakeFiles/xtrkcad.dir/DependInfo.cmake
new file mode 100644
index 0000000..0099d34
--- /dev/null
+++ b/app/bin/CMakeFiles/xtrkcad.dir/DependInfo.cmake
@@ -0,0 +1,36 @@
+# The set of languages for which implicit dependencies are needed:
+set(CMAKE_DEPENDS_LANGUAGES
+  "C"
+  )
+# The set of files for implicit dependencies of each language:
+set(CMAKE_DEPENDS_CHECK_C
+  "/home/martin/XTrackCAD/src/work/app/bin/misc.c" "/home/martin/XTrackCAD/src/work/app/bin/CMakeFiles/xtrkcad.dir/misc.c.o"
+  )
+set(CMAKE_C_COMPILER_ID "GNU")
+
+# Preprocessor definitions for this target.
+set(CMAKE_TARGET_DEFINITIONS_C
+  "XTRKCAD_CMAKE_BUILD"
+  )
+
+# The include file search paths:
+set(CMAKE_C_TARGET_INCLUDE_PATH
+  "/usr/local/include"
+  "app/bin"
+  "app/dynstring"
+  "app/cornu"
+  "."
+  "app/help"
+  "app/wlib/include"
+  )
+
+# Targets to which this target links.
+set(CMAKE_TARGET_LINKED_INFO_FILES
+  "/home/martin/XTrackCAD/src/work/app/bin/CMakeFiles/xtrkcad-lib.dir/DependInfo.cmake"
+  "/home/martin/XTrackCAD/src/work/app/wlib/gtklib/CMakeFiles/xtrkcad-wlib.dir/DependInfo.cmake"
+  "/home/martin/XTrackCAD/src/work/app/cornu/CMakeFiles/xtrkcad-cornu.dir/DependInfo.cmake"
+  "/home/martin/XTrackCAD/src/work/app/dynstring/CMakeFiles/dynstring.dir/DependInfo.cmake"
+  )
+
+# Fortran module output directory.
+set(CMAKE_Fortran_TARGET_MODULE_DIR "")
diff --git a/app/bin/CMakeFiles/xtrkcad.dir/build.make b/app/bin/CMakeFiles/xtrkcad.dir/build.make
new file mode 100644
index 0000000..ef1a206
--- /dev/null
+++ b/app/bin/CMakeFiles/xtrkcad.dir/build.make
@@ -0,0 +1,117 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.6
+
+# Delete rule output on recipe failure.
+.DELETE_ON_ERROR:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/martin/XTrackCAD/src/work
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/martin/XTrackCAD/src/work
+
+# Include any dependencies generated for this target.
+include app/bin/CMakeFiles/xtrkcad.dir/depend.make
+
+# Include the progress variables for this target.
+include app/bin/CMakeFiles/xtrkcad.dir/progress.make
+
+# Include the compile flags for this target's objects.
+include app/bin/CMakeFiles/xtrkcad.dir/flags.make
+
+app/bin/CMakeFiles/xtrkcad.dir/misc.c.o: app/bin/CMakeFiles/xtrkcad.dir/flags.make
+app/bin/CMakeFiles/xtrkcad.dir/misc.c.o: app/bin/misc.c
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object app/bin/CMakeFiles/xtrkcad.dir/misc.c.o"
+	cd /home/martin/XTrackCAD/src/work/app/bin && /usr/bin/gcc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/xtrkcad.dir/misc.c.o   -c /home/martin/XTrackCAD/src/work/app/bin/misc.c
+
+app/bin/CMakeFiles/xtrkcad.dir/misc.c.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/xtrkcad.dir/misc.c.i"
+	cd /home/martin/XTrackCAD/src/work/app/bin && /usr/bin/gcc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/martin/XTrackCAD/src/work/app/bin/misc.c > CMakeFiles/xtrkcad.dir/misc.c.i
+
+app/bin/CMakeFiles/xtrkcad.dir/misc.c.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/xtrkcad.dir/misc.c.s"
+	cd /home/martin/XTrackCAD/src/work/app/bin && /usr/bin/gcc  $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/martin/XTrackCAD/src/work/app/bin/misc.c -o CMakeFiles/xtrkcad.dir/misc.c.s
+
+app/bin/CMakeFiles/xtrkcad.dir/misc.c.o.requires:
+
+.PHONY : app/bin/CMakeFiles/xtrkcad.dir/misc.c.o.requires
+
+app/bin/CMakeFiles/xtrkcad.dir/misc.c.o.provides: app/bin/CMakeFiles/xtrkcad.dir/misc.c.o.requires
+	$(MAKE) -f app/bin/CMakeFiles/xtrkcad.dir/build.make app/bin/CMakeFiles/xtrkcad.dir/misc.c.o.provides.build
+.PHONY : app/bin/CMakeFiles/xtrkcad.dir/misc.c.o.provides
+
+app/bin/CMakeFiles/xtrkcad.dir/misc.c.o.provides.build: app/bin/CMakeFiles/xtrkcad.dir/misc.c.o
+
+
+# Object files for target xtrkcad
+xtrkcad_OBJECTS = \
+"CMakeFiles/xtrkcad.dir/misc.c.o"
+
+# External object files for target xtrkcad
+xtrkcad_EXTERNAL_OBJECTS =
+
+app/bin/xtrkcad: app/bin/CMakeFiles/xtrkcad.dir/misc.c.o
+app/bin/xtrkcad: app/bin/CMakeFiles/xtrkcad.dir/build.make
+app/bin/xtrkcad: app/bin/libxtrkcad-lib.a
+app/bin/xtrkcad: app/wlib/gtklib/libxtrkcad-wlib.a
+app/bin/xtrkcad: app/cornu/libxtrkcad-cornu.a
+app/bin/xtrkcad: app/dynstring/libdynstring.a
+app/bin/xtrkcad: app/bin/CMakeFiles/xtrkcad.dir/link.txt
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking C executable xtrkcad"
+	cd /home/martin/XTrackCAD/src/work/app/bin && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/xtrkcad.dir/link.txt --verbose=$(VERBOSE)
+
+# Rule to build all files generated by this target.
+app/bin/CMakeFiles/xtrkcad.dir/build: app/bin/xtrkcad
+
+.PHONY : app/bin/CMakeFiles/xtrkcad.dir/build
+
+app/bin/CMakeFiles/xtrkcad.dir/requires: app/bin/CMakeFiles/xtrkcad.dir/misc.c.o.requires
+
+.PHONY : app/bin/CMakeFiles/xtrkcad.dir/requires
+
+app/bin/CMakeFiles/xtrkcad.dir/clean:
+	cd /home/martin/XTrackCAD/src/work/app/bin && $(CMAKE_COMMAND) -P CMakeFiles/xtrkcad.dir/cmake_clean.cmake
+.PHONY : app/bin/CMakeFiles/xtrkcad.dir/clean
+
+app/bin/CMakeFiles/xtrkcad.dir/depend:
+	cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/bin /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/bin /home/martin/XTrackCAD/src/work/app/bin/CMakeFiles/xtrkcad.dir/DependInfo.cmake --color=$(COLOR)
+.PHONY : app/bin/CMakeFiles/xtrkcad.dir/depend
+
diff --git a/app/bin/CMakeFiles/xtrkcad.dir/cmake_clean.cmake b/app/bin/CMakeFiles/xtrkcad.dir/cmake_clean.cmake
new file mode 100644
index 0000000..743ddc1
--- /dev/null
+++ b/app/bin/CMakeFiles/xtrkcad.dir/cmake_clean.cmake
@@ -0,0 +1,10 @@
+file(REMOVE_RECURSE
+  "CMakeFiles/xtrkcad.dir/misc.c.o"
+  "xtrkcad.pdb"
+  "xtrkcad"
+)
+
+# Per-language clean rules from dependency scanning.
+foreach(lang C)
+  include(CMakeFiles/xtrkcad.dir/cmake_clean_${lang}.cmake OPTIONAL)
+endforeach()
diff --git a/app/bin/CMakeFiles/xtrkcad.dir/depend.make b/app/bin/CMakeFiles/xtrkcad.dir/depend.make
new file mode 100644
index 0000000..2406640
--- /dev/null
+++ b/app/bin/CMakeFiles/xtrkcad.dir/depend.make
@@ -0,0 +1,2 @@
+# Empty dependencies file for xtrkcad.
+# This may be replaced when dependencies are built.
diff --git a/app/bin/CMakeFiles/xtrkcad.dir/flags.make b/app/bin/CMakeFiles/xtrkcad.dir/flags.make
new file mode 100644
index 0000000..5131b8b
--- /dev/null
+++ b/app/bin/CMakeFiles/xtrkcad.dir/flags.make
@@ -0,0 +1,10 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.6
+
+# compile C with /usr/bin/gcc
+C_FLAGS = -g3 -gdwarf-2   -std=gnu99
+
+C_DEFINES = -DXTRKCAD_CMAKE_BUILD
+
+C_INCLUDES = -I/usr/local/include -I/home/martin/XTrackCAD/src/work/app/bin -I/home/martin/XTrackCAD/src/work/app/dynstring -I/home/martin/XTrackCAD/src/work/app/cornu -I/home/martin/XTrackCAD/src/work -I/home/martin/XTrackCAD/src/work/app/help -I/home/martin/XTrackCAD/src/work/app/wlib/include 
+
diff --git a/app/bin/CMakeFiles/xtrkcad.dir/link.txt b/app/bin/CMakeFiles/xtrkcad.dir/link.txt
new file mode 100644
index 0000000..be8c441
--- /dev/null
+++ b/app/bin/CMakeFiles/xtrkcad.dir/link.txt
@@ -0,0 +1 @@
+/usr/bin/gcc  -g3 -gdwarf-2   CMakeFiles/xtrkcad.dir/misc.c.o  -o xtrkcad -rdynamic libxtrkcad-lib.a ../wlib/gtklib/libxtrkcad-wlib.a ../cornu/libxtrkcad-cornu.a ../dynstring/libdynstring.a -lm -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype -lwebkitgtk-1.0 -lsoup-2.4 -ljavascriptcoregtk-1.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype -lwebkitgtk-1.0 -lsoup-2.4 -ljavascriptcoregtk-1.0 
diff --git a/app/bin/CMakeFiles/xtrkcad.dir/progress.make b/app/bin/CMakeFiles/xtrkcad.dir/progress.make
new file mode 100644
index 0000000..6c287f1
--- /dev/null
+++ b/app/bin/CMakeFiles/xtrkcad.dir/progress.make
@@ -0,0 +1,3 @@
+CMAKE_PROGRESS_1 = 
+CMAKE_PROGRESS_2 = 
+