merge

.gitignore

@@ -52,4 +52,13 @@ Mkfile.old
 dkms.conf
 
 build/
+docs/
+
 .DS_Store
+
+*UserInterfaceState.xcuserstate
+*xcdebugger*
+*xcshareddata*
+vs.xcuserdatad
+
+*.xcuserdatad

.gitlab-ci.yml

@@ -0,0 +1,38 @@
+# This file is a template, and might need editing before it works on your project.
+# use the official gcc image, based on debian
+# can use verions as well, like gcc:5.2
+# see https://hub.docker.com/_/gcc/
+image: gcc
+before_script:
+   - apt-get update --yes
+   - apt-get install --yes cmake
+build:
+  stage: build
+  # instead of calling g++ directly you can also use some build toolkit like make
+  # install the necessary build tools when needed
+  # before_script: 
+  #   - apt update && apt -y install make autoconf 
+  script: 
+    #- git submodule init
+    #- git submodule update
+    - mkdir build
+    - cd build
+    - cmake ..
+    - make
+    - ./test/test_wsh
+
+  artifacts:
+    paths:
+      - build/libwsh.a
+      - build/test/test_wsh
+  # depending on your build setup it's most likely a good idea to cache outputs to reduce the build time
+  cache:
+    paths:
+      - "*.o"
+
+# run tests using the binary built before
+#test:
+#  stage: test
+#  script:
+#    - ./build/test/test_wsh
+

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "cJSON"]
-	path = cJSON
-	url = https://github.com/DaveGamble/cJSON
 [submodule "contrib/cjson"]
 	path = contrib/cjson
 	url = https://github.com/DaveGamble/cJSON

CMakeLists.txt

@@ -1,39 +1,191 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required(VERSION 3.0)
+
 
-project(wsh)
 set(project_name wsh)
 
+project(${project_name})
+
+set (${project_name}_VERSION_MAJOR 0)
+set (${project_name}_VERSION_MINOR 0)
+set (${project_name}_VERSION_PATCH 1)
+
+option(BuildLibrary "Build ${project_name} static library" ON)
+option(BuildDocumentation "BuildDocumentation" OFF)
+option(BuildDemo "BuildDemo" OFF)
+option(BuildTest "BuildTest" ON)
+option(EnableGPC "EnableGPC" OFF)
+
 macro(use_c99)
-  if (CMAKE_VERSION VERSION_LESS "3.1")
-    if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
-      set (CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
-    endif ()
-  else ()
-    set (CMAKE_C_STANDARD 99)
-  endif ()
+  if(CMAKE_VERSION VERSION_LESS "3.1")
+    if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+      set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
+    endif()
+  else()
+    set(CMAKE_C_STANDARD 99)
+  endif()
 endmacro(use_c99)
 
-set (wsh_VERSION_MAJOR 0)
-set (wsh_VERSION_MINOR 0)
-set (wsh_VERSION_PATCH 1)
+use_c99()
+
+
+if(${BuildTest})
+	add_subdirectory(test)
+endif()
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
+
+if(CMAKE_BUILD_TYPE)
+	if (${CMAKE_BUILD_TYPE} STREQUAL "release")
+		set(BuildDocumentation ON)
+	else()
+		set(CMAKE_BUILD_TYPE "debug")
+	endif()
+else()
+	set(CMAKE_BUILD_TYPE "debug")
+endif()
+
+message("CMAKE build type:" ${CMAKE_BUILD_TYPE})
+
+message(${project_name})
+
+if (CMAKE_BUILD_TYPE EQUAL "debug")
+
+else()
+
+endif ()
+
+if (${have_r4_environment})
+	message("Enabling the JSON backend?")
+	add_definitions(-DWSH_ENABLE_SERIAL_BACKEND_JSON)
+
+	set(EnableGPC ON)
+
+endif()
+
+
+if(BuildLibrary)
+	message("Adding library target.")
+	if (EnableGPC)
+		set(ext_src src/ext/*.c)
+	else()
+		set(ext_src src/ext/wsh_player.c)
+	endif()
+
+	file(GLOB sources wsh.c ${ext_src} src/core/*.c src/geo/*.c src/io/*.c src/serial/*.c src/session/*.c src/util/*.c contrib/cjson/cJSON.c)
+	add_library(${project_name} STATIC ${sources})
+	# add_library(wsh SHARED ${sources})
+endif()
+
+
+if ( ${have_r4_environment} )
+	message("Building within r4 lib structure.")
+
+	target_include_directories(${project_name} PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}/contrib
+		/opt/X11/include)
+else()
+	message("Building standalone.")
+	target_include_directories(${project_name} PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}/contrib
+		/opt/X11/include)
+
+	macro(use_c99)
+		if (CMAKE_VERSION VERSION_LESS "3.1")
+			if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+				set (CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
+			endif ()
+		else ()
+			set (CMAKE_C_STANDARD 99)
+		endif ()
+	endmacro(use_c99)
+
+	# add_subdirectory(contrib/cjson)
+	# add_subdirectory(contrib/glfw)
+	# set(build_demo YES)
+
+	find_package(Doxygen)
+	option(BUILD_DOCUMENTATION "Create and install the HTML based API
+	documentation (requires Doxygen)" ${DOXYGEN_FOUND})
+
+
+	if(BUILD_DOCUMENTATION)
+		if(BuildDocumentation)
+			if (${CMAKE_BUILD_TYPE} STREQUAL "release")
+				set(BuildDoc YES)
+			endif()
+		endif()
+	endif()
+
+endif()
+
+
+find_package(LibGLFW )
+include_directories(${LibGLFW_INCLUDE_DIRS})
+set(LIBS ${LIBS} ${LibGLFW_LIBRARIES})
+
+if (GLFW_FOUND)
+	if (${CMAKE_BUILD_TYPE} STREQUAL "release")
+		set(BuildDemo YES)
+	endif()
+
+else()
+	message("Did not find GLFW, cannot build demo.")
+	set(BuildDemo NO)
+
+endif()
+
+
+
+find_package(LibFTGL )
+include_directories(${LibGLFW_INCLUDE_DIRS})
+set(LIBS ${LIBS} ${LibGLFW_LIBRARIES})
+
+if (FTGL_FOUND)
+	add_definitions(-DWSH_DEMO_ENABLE_FTGL)
+else()
+	message("Did not find FTGL.")
+endif()
+
+
+find_package(LibWCM )
+include_directories(${LibWCM_INCLUDE_DIRS})
+set(LIBS ${LIBS} ${LibGWCM_LIBRARIES})
+
+if (WCM_FOUND)
+	add_definitions(-DWSH_DEMO_ENABLE_WCM)
+else()
+	message("Did not find WCM.")
+endif()
+
+if (${BuildDemo})
+	message("Adding demo to build targets.")
+	add_subdirectory(demo)
+endif()
+
+if (${BuildDoc})
+	message("Adding documentation to build targets.")
 
-file(GLOB sources *.c src/core/*.c src/geo/*.c src/io/*.c src/serial/*.c src/session/*.c src/util/*.c)
+	set(doxyfile_in ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile)
+	set(doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
 
-add_library(wsh SHARED STATIC ${sources})
-# add_library(wsh SHARED ${sources})
+	configure_file(${doxyfile_in} ${doxyfile} @ONLY)
 
-if ( ${have_r4_environment} MATCHES "yes")
+	message("Doxygen build started.")
+	add_custom_target(
+		doc ALL
+		COMMAND ${DOXYGEN_EXECUTABLE} ${doxyfile_in}
+		      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+		      COMMENT "Generating API documentation with Doxygen"
+		      VERBATIM)
+endif()
 
-else(${have_r4_environment})
-	add_subdirectory(contrib/cjson)
-	add_subdirectory(contrib/glfw)
-endif(${have_r4_environment})
 
-add_subdirectory(demo)
+target_include_directories (${project_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..
+	${CMAKE_CURRENT_SOURCE_DIR}/contrib)
 
+add_custom_command(TARGET ${project_name} POST_BUILD        # Adds a post-build event to MyTest
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different  # which executes "cmake - E copy_if_different..."
+        "${CMAKE_BINARY_DIR}/libs/${project_name}/lib${project_name}${CMAKE_STATIC_LIBRARY_SUFFIX}"      # <--this is in-file
+        ${CMAKE_CURRENT_SOURCE_DIR}/lib/osx)                 # <--this is out-file path
 
-target_include_directories (${project_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
-target_include_directories (${project_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../contrib/include)
-target_include_directories (${project_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../contrib)
-target_include_directories (${project_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../contrib/deps)
 

Doxyfile

@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = ../../docs/wsh
+OUTPUT_DIRECTORY       = docs
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -889,7 +889,10 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = */contrib/*
+EXCLUDE_PATTERNS      += */build/*
+EXCLUDE_PATTERNS      += */demo/*
+EXCLUDE_PATTERNS      += */test/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -1581,7 +1584,7 @@ SEARCHENGINE           = YES
 # setting. When disabled, doxygen will generate a PHP script for searching and
 # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
 # and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
+# "External Indexing and app_extensions.enable_audio" for details.
 # The default value is: NO.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
@@ -1597,7 +1600,7 @@ SERVER_BASED_SEARCH    = NO
 # (doxysearch.cgi) which are based on the open source search engine library
 # Xapian (see: http://xapian.org/).
 #
-# See the section "External Indexing and Searching" for details.
+# See the section "External Indexing and app_extensions.enable_audio" for details.
 # The default value is: NO.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
@@ -1609,7 +1612,7 @@ EXTERNAL_SEARCH        = NO
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
 # Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
+# app_extensions.enable_audio" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
 SEARCHENGINE_URL       =

cmake/Modules/FindLibFTGL.cmake

@@ -0,0 +1,72 @@
+# Find FTGL 3
+#
+# FTGL_LIBRARIES
+# FTGL_INCLUDE_DIRS.
+# FTGL_FOUND
+
+IF(NOT UNIX)
+    IF(NOT FTGL_ROOT)
+        MESSAGE("ERROR: FTGL_ROOT must be set!")
+    ENDIF(NOT FTGL_ROOT)
+
+    FIND_PATH(FTGL_INCLUDE_DIRS DOC "Path to FTGL include directory."
+            NAMES FTGL/ftgl.h
+            PATHS ${FTGL_ROOT}/include)
+
+    IF(MSVC15)
+        FIND_LIBRARY(FTGL_LIBRARIES DOC "Absolute path to FTGL library."
+                NAMES ftgl.lib
+                PATHS ${FTGL_ROOT}/lib-vc2015)
+    ELSEIF(MSVC13)
+        FIND_LIBRARY(FTGL_LIBRARIES DOC "Absolute path to FTGL library."
+                NAMES ftgl.lib
+                PATHS ${FTGL_ROOT}/lib-vc2013)
+    ELSEIF(MSVC12)
+        FIND_LIBRARY(FTGL_LIBRARIES DOC "Absolute path to FTGL library."
+                NAMES ftgl.lib
+                PATHS ${FTGL_ROOT}/lib-vc2012)
+    ELSEIF(MSVC10)
+        FIND_LIBRARY(FTGL_LIBRARIES DOC "Absolute path to FTGL library."
+                NAMES ftgl.lib
+                PATHS ${FTGL_ROOT}/lib-vc2010)
+    ELSEIF(MINGW)
+        IF(CMAKE_CL_64)
+            FIND_LIBRARY(FTGL_LIBRARIES DOC "Absolute path to FTGL library."
+                    NAMES ftgl.dll
+                    PATHS ${FTGL_ROOT}/lib-mingw-w64)
+        ELSE(CMAKE_CL_64)
+            FIND_LIBRARY(FTGL_LIBRARIES DOC "Absolute path to FTGL library."
+                    NAMES ftgl.dll
+                    PATHS ${FTGL_ROOT}/lib-mingw)
+        ENDIF(CMAKE_CL_64)
+    ELSE(MINGW)
+        # Default to latest version of VC libs
+        FIND_LIBRARY(FTGL_LIBRARIES DOC "Absolute path to FTGL library."
+                NAMES ftgl.lib
+                PATHS ${FTGL_ROOT}/lib-vc2015)
+    ENDIF(MSVC15)
+ELSE(NOT UNIX)
+    FIND_PATH(FTGL_INCLUDE_DIRS DOC "Path to FTGL include directory."
+            NAMES FTGL/ftgl.h
+            PATHS
+            /usr/include
+            /usr/local/include
+            /usr/target/include
+            /sw/include
+            /opt/local/include)
+
+    FIND_LIBRARY(FTGL_LIBRARIES DOC "Absolute path to FTGL library."
+            NAMES ftgl.dll ftgl.dylib libftgl.dylib libftgl.a
+            PATHS
+            /usr/local/lib
+            /usr/lib
+            /lib
+            contrib/ftgl/build
+            /usr/lib/arm-linux-gnueabihf)
+
+ENDIF(NOT UNIX)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FTGL DEFAULT_MSG FTGL_LIBRARIES FTGL_INCLUDE_DIRS)
+
+mark_as_advanced(FTGL_INCLUDE_DIRS FTGL_LIBRARIES)