Make it work on Linux

PedestrianDynamics · Jan 16, 2024 · 92c0f17 · 92c0f17
1 parent ae8bbca
commit 92c0f17
Show file tree

Hide file tree

Showing 12 changed files with 5,778 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Project setup
 ################################################################################
 cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
-project(JuPedSim VERSION 1.1.0 LANGUAGES CXX)
+project(JuPedSim VERSION 1.1.0 LANGUAGES CXX C)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)

diff --git a/jps-ui/CMakeLists.txt b/jps-ui/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(jps-ui
     imgui
     imgui_filedialog
     glm
+    glad
 )
 
 target_compile_definitions(jps-ui PUBLIC

diff --git a/jps-ui/src/main.cpp b/jps-ui/src/main.cpp
@@ -5,8 +5,8 @@
 #include "shader.hpp"
 #include "wkt.hpp"
 
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>
-#include <OpenGL/OpenGL.h>
 #include <geos_c.h>
 #include <glm/ext/matrix_clip_space.hpp>
 #include <glm/vec3.hpp>
@@ -91,6 +91,7 @@ int main(int argc, char** argv)
 
     /* Make the window's context current */
     glfwMakeContextCurrent(window);
+    gladLoadGL();
     glfwSwapInterval(1);
 
     IMGUI_CHECKVERSION();

diff --git a/jps-ui/src/shader.cpp b/jps-ui/src/shader.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 #include "shader.hpp"
 
-#include <OpenGL/OpenGL.h>
 #include <glm/glm.hpp>
 #include <glm/gtc/type_ptr.hpp>
 

diff --git a/jps-ui/src/shader.hpp b/jps-ui/src/shader.hpp
@@ -1,14 +1,15 @@
 // Copyright © 2024 Forschungszentrum Jülich GmbH
 // SPDX-License-Identifier: LGPL-3.0-or-later
 #pragma once
-
+#include <glad/glad.h>
 #include <GLFW/glfw3.h>
 
 #include <glm/glm.hpp>
 
 #include <stdexcept>
 #include <string>
 #include <string_view>
+#include <unordered_map>
 
 class Shader
 {

diff --git a/jps-ui/src/wkt.cpp b/jps-ui/src/wkt.cpp
@@ -3,7 +3,6 @@
 #include "wkt.hpp"
 #include "aabb.hpp"
 
-#include <OpenGL/OpenGL.h>
 #include <geos_c.h>
 #include <glm/glm.hpp>
 

diff --git a/jps-ui/src/wkt.hpp b/jps-ui/src/wkt.hpp
@@ -7,7 +7,8 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Polygon_with_holes_2.h>
 
-#include <OpenGL/OpenGL.h>
+#include <glad/glad.h>
+#include <GLFW/glfw3.h>
 #include <geos_c.h>
 
 #include <array>

diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
@@ -75,6 +75,7 @@ endif()
 # DearImGui / ImGuiFileDialog
 ################################################################################
 if(BUILD_JPS_UI)
+    add_subdirectory(glad)
     set(BUILD_SHARED_LIBS_BEFORE ${BUILD_SHARED_LIBS})
     set(BUILD_SHARED_LIBS OFF)
     find_package(OpenGL REQUIRED)

diff --git a/third-party/glad/CMakeLists.txt b/third-party/glad/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_library(glad STATIC
+    glad/glad.h
+    glad/glad.c
+    glad/khrplatform.h
+)
+
+target_include_directories(glad PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ target_link_libraries(jps-ui @@
         imgui
         imgui_filedialog
         glm
+        glad
     )
     target_compile_definitions(jps-ui PUBLIC
@@ Expand Down @@