Merge branch 'master' into phil-dist_model_v5

* master:
  Fix GL matrix handling.
  Correct conditional GL.
  GLES2 support.

Author: philip-lamb

Linux/CMakeLists.txt

@@ -8,7 +8,7 @@
 #
 
 #
-# Packages required: libjpeg-dev libopencv-calib3d-dev libssl-dev libcurl4-openssl-dev
+# Packages required: libjpeg-dev libopencv-calib3d-dev libssl-dev libcurl4-openssl-dev libconfig-dev
 #
 
 cmake_minimum_required( VERSION 3.2 )
@@ -28,10 +28,25 @@ project("artoolkitx_calib_camera"
 set(ARTOOLKITX_HOME "${CMAKE_CURRENT_SOURCE_DIR}/../../artoolkitx")
 set(ARTOOLKITX_CAMERA_CALIBRATION_HOME "${CMAKE_CURRENT_SOURCE_DIR}/..")
 
-list(APPEND CMAKE_FIND_ROOT_PATH "${ARTOOLKITX_HOME}/Source/depends/linux")
-list(APPEND CMAKE_FIND_ROOT_PATH "${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/depends/linux")
+add_definitions("-DARX_TARGET_PLATFORM_LINUX=1")
 
-add_definitions("-DTARGET_PLATFORM_LINUX=1")
+if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+    add_definitions("-DDEBUG=1")
+endif()
+
+# Search prefix.
+list(APPEND CMAKE_MODULE_PATH "${ARTOOLKITX_HOME}/Source/cmake")
+if(ARX_TARGET_PLATFORM_VARIANT)
+    list(APPEND CMAKE_FIND_ROOT_PATH "${ARTOOLKITX_HOME}/Source/depends/linux-${ARX_TARGET_PLATFORM_VARIANT}")
+    list(APPEND CMAKE_FIND_ROOT_PATH "${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/depends/linux-${ARX_TARGET_PLATFORM_VARIANT}")
+else()
+    list(APPEND CMAKE_FIND_ROOT_PATH "${ARTOOLKITX_HOME}/Source/depends/linux")
+    list(APPEND CMAKE_FIND_ROOT_PATH "${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/depends/linux")
+endif()
+if ("${ARX_TARGET_PLATFORM_VARIANT}" STREQUAL "raspbian")
+    list(APPEND CMAKE_FIND_ROOT_PATH "/opt/vc/")
+    set(GL_PREFER_EMBEDDED 1)
+endif()
 
 # Installation settings.
 # If the user didn't define CMAKE_INSTALL_PREFIX, set a local install destination.
@@ -47,13 +62,26 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 include_directories(${ARTOOLKITX_CAMERA_CALIBRATION_HOME})
 
-find_package(OpenGL REQUIRED)
-include_directories(${OPENGL_INCLUDE_DIR})
-
 find_package(SDL2 REQUIRED)
-include(${SDL2_DIR}/sdl2-config.cmake)
-string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
-include_directories(${SDL2_INCLUDE_DIRS})
+string(STRIP "${SDL2_LIBRARY}" SDL2_LIBRARY)
+include_directories(${SDL2_INCLUDE_DIR})
+if ("${ARX_TARGET_PLATFORM_VARIANT}" STREQUAL "raspbian")
+    list(APPEND SDL2_LIBRARY -Wl,--no-undefined -lm -L/opt/vc/lib -lbcm_host -ldl -ldl -lpthread -lrt)
+endif()
+
+find_package(OpenGL)
+find_package(OpenGLES2)
+find_package(OpenGL3)
+if ((OPENGL_FOUND OR OpenGL3_FOUND) AND OPENGLES2_FOUND)
+    if(GL_PREFER_EMBEDDED)
+        set(OPENGL_FOUND 0)
+        set(OpenGL3_FOUND 0)
+        message(STATUS "Opting for embedded OpenGL")
+    else()
+        set(OPENGLES2_FOUND 0)
+        message(STATUS "Opting for desktop OpenGL. Set GL_PREFER_EMBEDDED to change.")
+    endif()
+endif()
 
 find_package(JPEG REQUIRED)
 include_directories(${JPEG_INCLUDE_DIR})
@@ -145,8 +173,7 @@ add_dependencies(${CMAKE_PROJECT_NAME}
 
 target_link_libraries(${CMAKE_PROJECT_NAME}
     ARX
-    ${OPENGL_LIBRARIES}
-    ${SDL2_LIBRARIES}
+    ${SDL2_LIBRARY}
     ${JPEG_LIBRARIES}
     ${OPENCV_CALIB3D_LIBRARY} ${OPENCV_FEATURES2D_LIBRARY} ${OPENCV_IMGPROC_LIBRARY} ${OPENCV_FLANN_LIBRARY} ${OPENCV_CORE_LIBRARY}
     ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES}
@@ -155,6 +182,19 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
     m
 )
 
+if(OPENGL_FOUND)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${OPENGL_INCLUDE_DIR})
+    target_link_libraries(${CMAKE_PROJECT_NAME} ${OPENGL_LIBRARIES})
+endif()
+if(OPENGLES2_FOUND)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${OPENGLES2_INCLUDE_DIR})
+    target_link_libraries(${CMAKE_PROJECT_NAME} ${OPENGLES2_LIBRARIES})
+endif()
+if(OpenGL3_FOUND)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${OpenGL3_INCLUDE_PATH})
+    target_link_libraries(${CMAKE_PROJECT_NAME} ${OpenGL3_LIBRARIES})
+endif()
+
 get_directory_property(ARXCC_DEFINES DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS)
 foreach(d ${ARXCC_DEFINES})
     message(STATUS "Defined: " ${d})

build.sh

@@ -22,7 +22,7 @@ VERSION=`sed -En -e 's/.*VERSION_STRING[[:space:]]+"([0-9]+\.[0-9]+(\.[0-9]+)*)"
 VERSION=`echo -n "${VERSION}" | sed -E -e 's/([0-9]+\.[0-9]+)\.0/\1/'`
 
 function usage {
-    echo "Usage: $(basename $0) (macos | linux)... "
+    echo "Usage: $(basename $0) [--debug] (macos | windows | linux | linux-raspbian)... "
     exit 1
 }
 
@@ -31,7 +31,10 @@ if [ $# -eq 0 ]; then
 fi
 
 # -e = exit on errors; -x = debug
-set -e -x
+set -e
+
+# -x = debug
+#set -x
 
 # Parse parameters
 while test $# -gt 0
@@ -45,6 +48,12 @@ do
             ;;
         linux) BUILD_LINUX=1
             ;;
+        linux-raspbian) BUILD_LINUX_RASPBIAN=1
+            ;;
+        windows) BUILD_WINDOWS=1
+            ;;
+        --debug) DEBUG=
+            ;;
         --*) echo "bad option $1"
             usage
             ;;
@@ -55,7 +64,6 @@ do
     shift
 done
 
-
 # Set OS-dependent variables.
 OS=`uname -s`
 ARCH=`uname -m`
@@ -64,12 +72,25 @@ if [ "$OS" = "Linux" ]
 then
     CPUS=`/usr/bin/nproc`
     TAR='/bin/tar'
+    # Identify Linux OS. Sets useful variables: ID, ID_LIKE, VERSION, NAME, PRETTY_NAME.
+    source /etc/os-release
+    # Windows Subsystem for Linux identifies itself as 'Linux'. Additional test required.
+    if grep -qE "(Microsoft|WSL)" /proc/version &> /dev/null ; then
+        OS='Windows'
+    fi
 elif [ "$OS" = "Darwin" ]
 then
     CPUS=`/usr/sbin/sysctl -n hw.ncpu`
 elif [ "$OS" = "CYGWIN_NT-6.1" ]
 then
+    # bash on Cygwin.
+    CPUS=`/usr/bin/nproc`
+    OS='Windows'
+elif [ "$OS" = "MINGW64_NT-10.0" ]
+then
+    # git-bash on Windows.
     CPUS=`/usr/bin/nproc`
+    OS='Windows'
 else
     CPUS=1
 fi
@@ -184,6 +205,45 @@ if [ $BUILD_LINUX ] ; then
 fi
 # /BUILD_LINUX
 
+# Linux
+if [ $BUILD_LINUX_RASPBIAN ] ; then
+    (cd Linux
+	mkdir -p build-raspbian
+	cd build-raspbian
+	cmake .. -DCMAKE_BUILD_TYPE=Release -DARX_TARGET_PLATFORM_VARIANT="raspbian" -DVERSION="${VERSION}"
+    make
+	make install
+    )
+
+fi
+# /BUILD_LINUX_RASPBIAN
+
 fi
 # /Linux
 
+if [ "$OS" = "Windows" ] ; then
+# ======================================================================
+#  Build platforms hosted by Windows
+# ======================================================================
+
+# Windows
+if [ $BUILD_WINDOWS ] ; then
+
+    if [ ! -d "build-windows" ] ; then
+        mkdir build-windows
+    fi
+
+    SDK_FILENAME="artoolkitX for Windows v${SDK_VERSION_PRETTY}.dmg"
+    curl -f -o "${SDK_FILENAME}" --location "${SDK_URL_DIR}$(rawurlencode "${SDK_FILENAME}")"
+
+    (cd Windows
+    mkdir -p build
+    cd build
+    cmake.exe .. -DCMAKE_CONFIGURATION_TYPES=${DEBUG+Debug}${DEBUG-Release} "-GVisual Studio 15 2017 Win64"  -D"VERSION=${VERSION}"
+    cmake.exe --build . --config ${DEBUG+Debug}${DEBUG-Release}  --target install
+    )
+fi
+# /BUILD_WINDOWS
+
+fi
+# /Windows