From 1d48d390d35bf9769f60a511e1c49bc37f404be9 Mon Sep 17 00:00:00 2001
From: IlyaShurupov <ilusha@workspace.com>
Date: Wed, 10 Jan 2024 15:47:47 +0300
Subject: [PATCH] Exclude glew from manual build duo to errors. Using
 precompiled packages.

---
 Externals/CMakeLists.txt             | 6 +++---
 Externals/glew                       | 1 -
 Graphics/CMakeLists.txt              | 6 ++++--
 Graphics/private/bindings/Canvas.cpp | 3 ++-
 LibraryViewer/CMakeLists.txt         | 6 +++---
 5 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 160000 Externals/glew

diff --git a/Externals/CMakeLists.txt b/Externals/CMakeLists.txt
index 58c443d..83c4e95 100644
--- a/Externals/CMakeLists.txt
+++ b/Externals/CMakeLists.txt
@@ -1,6 +1,6 @@
 
-add_subdirectory(glew/build/cmake/)
-target_compile_definitions(glew_s PUBLIC GLEW_NO_GLU)
+#add_subdirectory(glew/build/cmake/)
+#target_compile_definitions(glew_s PUBLIC GLEW_NO_GLU)
 
 add_subdirectory(glfw)
 
@@ -49,4 +49,4 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 
 project(ImageIO)
 add_library(${PROJECT_NAME} INTERFACE)
-target_include_directories(${PROJECT_NAME} INTERFACE ./imageIO/)
\ No newline at end of file
+target_include_directories(${PROJECT_NAME} INTERFACE ./imageIO/)
diff --git a/Externals/glew b/Externals/glew
deleted file mode 160000
index a98195b..0000000
--- a/Externals/glew
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a98195b83df746202bdf5a6f92e9d4e86b497045
diff --git a/Graphics/CMakeLists.txt b/Graphics/CMakeLists.txt
index 221b49f..469e0ee 100644
--- a/Graphics/CMakeLists.txt
+++ b/Graphics/CMakeLists.txt
@@ -1,8 +1,10 @@
 project(Graphics)
 
+find_package(GLEW REQUIRED)
+
 ### ---------------------- Externals  ---------------------  ###
 set(BINDINGS_INCLUDE ../Externals/glfw/include ../Externals/glew/include)
-set(BINDINGS_LIBS glfw glew_s Imgui Nanovg)
+set(BINDINGS_LIBS glfw Imgui Nanovg ${GLEW_LIBRARIES} GL)
 
 
 ### ---------------------- Static Library  ---------------------  ###
@@ -24,4 +26,4 @@ enable_testing()
 file(GLOB TEST_SOURCES "./tests/*.cpp")
 add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
 target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
-add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
\ No newline at end of file
+add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)
diff --git a/Graphics/private/bindings/Canvas.cpp b/Graphics/private/bindings/Canvas.cpp
index 493e69c..0320a2f 100644
--- a/Graphics/private/bindings/Canvas.cpp
+++ b/Graphics/private/bindings/Canvas.cpp
@@ -1,6 +1,7 @@
 #include "Window.hpp"
 
 // -------- OpenGL -------- //
+#define GLEW_STATIC
 #include <GL/glew.h>
 
 #include "WindowContext.hpp"
@@ -97,4 +98,4 @@ void Graphics::Canvas::proc() {
 
 void Graphics::Canvas::draw() {
 	nvgEndFrame(mContext->vg);
-}
\ No newline at end of file
+}
diff --git a/LibraryViewer/CMakeLists.txt b/LibraryViewer/CMakeLists.txt
index 5dbe7ba..e86a449 100644
--- a/LibraryViewer/CMakeLists.txt
+++ b/LibraryViewer/CMakeLists.txt
@@ -1,11 +1,11 @@
 project(LibraryViewer)
 
 find_package(ALSA REQUIRED)
-# find_package(PortAudio REQUIRED)
+find_package(GLEW REQUIRED)
 
 ### ---------------------- Externals  ---------------------  ###
 set(BINDINGS_INCLUDE ../Externals/glfw/include ../Externals/glew/include)
-set(BINDINGS_LIBS glfw glew_s Imgui Nanovg portaudio)
+set(BINDINGS_LIBS glfw Imgui Nanovg ${GLEW_LIBRARIES} GL portaudio)
 
 ### ---------------------- Static Library  ---------------------  ###
 file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp")
@@ -22,4 +22,4 @@ file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAM
 
 ### -------------------------- Applications  --------------------------  ###
 add_executable(libView ./applications/Entry.cpp)
-target_link_libraries(libView ${PROJECT_NAME} ${ALSA_LIBRARY})
\ No newline at end of file
+target_link_libraries(libView ${PROJECT_NAME} ${ALSA_LIBRARY})