ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Exclude glew from manual build duo to errors. Using precompiled packages.

Browse source
This commit is contained in:
IlyaShurupov 2024-01-10 15:47:47 +03:00 • committed by Ilya Shurupov
parent 5a3e07f4f3
commit 1d48d390d3
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Externals/CMakeLists.txt vendored
View file

@ -1,6 +1,6 @@
add_subdirectory(glew/build/cmake/) #add_subdirectory(glew/build/cmake/)
target_compile_definitions(glew_s PUBLIC GLEW_NO_GLU) #target_compile_definitions(glew_s PUBLIC GLEW_NO_GLU)
add_subdirectory(glfw) add_subdirectory(glfw)

1
Externals/glew vendored

@ -1 +0,0 @@
Subproject commit a98195b83df746202bdf5a6f92e9d4e86b497045

4
Graphics/CMakeLists.txt
View file

@ -1,8 +1,10 @@
project(Graphics) project(Graphics)
find_package(GLEW REQUIRED)
### ---------------------- Externals --------------------- ### ### ---------------------- Externals --------------------- ###
set(BINDINGS_INCLUDE ../Externals/glfw/include ../Externals/glew/include) 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 --------------------- ### ### ---------------------- Static Library --------------------- ###

1
Graphics/private/bindings/Canvas.cpp
View file

@ -1,6 +1,7 @@
#include "Window.hpp" #include "Window.hpp"
// -------- OpenGL -------- // // -------- OpenGL -------- //
#define GLEW_STATIC
#include <GL/glew.h> #include <GL/glew.h>
#include "WindowContext.hpp" #include "WindowContext.hpp"

4
LibraryViewer/CMakeLists.txt
View file

@ -1,11 +1,11 @@
project(LibraryViewer) project(LibraryViewer)
find_package(ALSA REQUIRED) find_package(ALSA REQUIRED)
# find_package(PortAudio REQUIRED) find_package(GLEW REQUIRED)
### ---------------------- Externals --------------------- ### ### ---------------------- Externals --------------------- ###
set(BINDINGS_INCLUDE ../Externals/glfw/include ../Externals/glew/include) 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 --------------------- ### ### ---------------------- Static Library --------------------- ###
file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp") file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp")