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
parent f7fd0c5942
commit 81e16e1c50
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
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)
@ -49,4 +49,4 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
project(ImageIO) project(ImageIO)
add_library(${PROJECT_NAME} INTERFACE) add_library(${PROJECT_NAME} INTERFACE)
target_include_directories(${PROJECT_NAME} INTERFACE ./imageIO/) target_include_directories(${PROJECT_NAME} INTERFACE ./imageIO/)

1
Externals/glew vendored

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

6
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 --------------------- ###
@ -24,4 +26,4 @@ enable_testing()
file(GLOB TEST_SOURCES "./tests/*.cpp") file(GLOB TEST_SOURCES "./tests/*.cpp")
add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES}) add_executable(${PROJECT_NAME}Tests ${TEST_SOURCES})
target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils) target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} Utils)
add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests) add_test(NAME ${PROJECT_NAME}Tests COMMAND ${PROJECT_NAME}Tests)

3
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"
@ -97,4 +98,4 @@ void Graphics::Canvas::proc() {
void Graphics::Canvas::draw() { void Graphics::Canvas::draw() {
nvgEndFrame(mContext->vg); nvgEndFrame(mContext->vg);
} }

6
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")
@ -22,4 +22,4 @@ file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAM
### -------------------------- Applications -------------------------- ### ### -------------------------- Applications -------------------------- ###
add_executable(libView ./applications/Entry.cpp) add_executable(libView ./applications/Entry.cpp)
target_link_libraries(libView ${PROJECT_NAME} ${ALSA_LIBRARY}) target_link_libraries(libView ${PROJECT_NAME} ${ALSA_LIBRARY})