Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary dependency on glu.h via glew.h #320

Merged
merged 2 commits into from
Nov 5, 2024
Merged

Remove unnecessary dependency on glu.h via glew.h #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55a5688
The GLEW header tries to include glu.h (which is not needed).
v-dobrev Nov 3, 2024
14f6fb9
Added -DGLEW_NO_GLU to CMake.
v-dobrev Nov 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ if (NOT EMSCRIPTEN)
list(APPEND CMAKE_PREFIX_PATH "../glew")
find_package(GLEW REQUIRED)
list(APPEND _glvis_libraries GLEW::GLEW)
# See https://github.com/nigels-com/glew/issues/192
list(APPEND _glvis_compile_defs "GLEW_NO_GLU")

# Find 'glm' which is not part of the CMake standard modules
list(APPEND GLM_DIR "../glm")
Expand Down
3 changes: 2 additions & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,10 @@ OPENGL_LIB_DIR = $(if $(NOTMAC),$(call dir2lib,$(OPENGL_DIR),GL))
OPENGL_LIBS = $(if $(NOTMAC),-lGL,-framework OpenGL -framework Cocoa)


# Regarding -DGLEW_NO_GLU, see https://github.com/nigels-com/glew/issues/192
GL_OPTS ?= $(if $(FREETYPE_DIR),-I$(FREETYPE_DIR)/include/freetype2) \
$(if $(SDL_DIR),-I$(SDL_DIR)/include) \
$(if $(GLEW_DIR),-I$(GLEW_DIR)/include) \
$(if $(GLEW_DIR),-I$(GLEW_DIR)/include) -DGLEW_NO_GLU \
$(if $(GLM_DIR),-I$(GLM_DIR)) \
$(if $(OPENGL_DIR),-I$(OPENGL_DIR)/include)

Expand Down
Loading