Exclude glew from manual build duo to errors. Using precompiled packages.
This commit is contained in:
parent
f7fd0c5942
commit
81e16e1c50
5 changed files with 12 additions and 10 deletions
4
Externals/CMakeLists.txt
vendored
4
Externals/CMakeLists.txt
vendored
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
1
Externals/glew
vendored
1
Externals/glew
vendored
|
|
@ -1 +0,0 @@
|
|||
Subproject commit a98195b83df746202bdf5a6f92e9d4e86b497045
|
||||
|
|
@ -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 --------------------- ###
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#include "Window.hpp"
|
||||
|
||||
// -------- OpenGL -------- //
|
||||
#define GLEW_STATIC
|
||||
#include <GL/glew.h>
|
||||
|
||||
#include "WindowContext.hpp"
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue