Pi fixes

Author: cmaughan

app/cmake/config.h.cmake

@@ -1,3 +1,4 @@
 #cmakedefine APP_ROOT "${APP_ROOT}"
 #cmakedefine QT_OLD_API ${QT_OLD_API}
+#cmakedefine RASPBERRY_PI ${RASPBERRY_PI}
 

app/gui/imgui/CMakeLists.txt

@@ -72,6 +72,17 @@ target_include_directories(${APP_NAME}
     ${CMAKE_BINARY_DIR}
     )
 
+# Extras for compiling on PI:  Use ES2
+if (RASPBERRY_PI)
+target_compile_definitions(${APP_NAME} PRIVATE 
+	IMGUI_IMPL_OPENGL_ES2)
+
+target_link_directories(${APP_NAME}
+	PRIVATE
+	 /opt/vc/lib
+	 )
+endif()
+
 target_link_libraries (${APP_NAME} 
     PRIVATE
     SonicPi::API

app/gui/imgui/main.cpp

@@ -40,7 +40,8 @@ using namespace gl;
 #include <glbinding/gl/gl.h>
 using namespace gl;
 #else
-#include IMGUI_IMPL_OPENGL_LOADER_CUSTOM
+#include <GLES2/gl2.h>          // Use GL ES 3
+//#include IMGUI_IMPL_OPENGL_LOADER_CUSTOM
 #endif
 
 namespace
@@ -81,9 +82,16 @@ int main(int, char**)
     // GL 3.0 + GLSL 130
     const char* glsl_version = "#version 130";
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, 0);
+#ifdef RASPBERRY_PI
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+#else
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+#endif
+    
 #endif
 
     // Create window with graphics context
@@ -171,7 +179,7 @@ int main(int, char**)
 
     // Setup Platform/Renderer backends
     ImGui_ImplSDL2_InitForOpenGL(window, gl_context);
-    ImGui_ImplOpenGL3_Init(glsl_version);
+    ImGui_ImplOpenGL3_Init();
 
     // Load Fonts
     // - If no fonts are loaded, dear imgui will use the default font. You can also load multiple fonts and use ImGui::PushFont()/PopFont() to select them.

app/pi-config.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e # Quit script on error
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+config=""
+
+if [ "$1" = "--config" ]; then
+  case $2 in
+    Release|Debug|RelWithDebInfo|MinSizeRel)
+      config="$2"
+      ;;
+    *)
+      echo "`basename $0`: Error: invalid configuration: '${2}'" 1>&2
+      echo "Valid configurations: Release, Debug, RelWithDebInfo, MinSizeRel" 1>&2
+      exit 1
+      ;;
+  esac
+elif [ ! -z $1 ]; then
+  echo "`basename $0`: Error: invalid parameter: '${1}'" 1>&2
+  echo "Usage: `basename $0` [--config <Release|Debug|RelWithDebInfo|MinSizeRel>]" 1>&2
+  exit 1
+fi
+
+echo "Creating build directory..."
+mkdir -p "${SCRIPT_DIR}/build"
+
+echo "Generating makefiles..."
+cd "${SCRIPT_DIR}/build"
+cmake -G "Unix Makefiles" -DRASPBERRY_PI=1 -DCMAKE_BUILD_TYPE=\"$config\" ..
+
+cd "${SCRIPT_DIR}"

app/raspbian-setup.sh

@@ -0,0 +1,6 @@
+
+sudo apt update
+sudo apt install snapd
+sudo snap install cmake --classic
+sudo apt remove cmake
+echo "Remember to reboot to get the new cmake!"