diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bcd4c07..a2c29142 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,12 +33,8 @@ else() set(LOVR_LUA ${LUAJIT_LIBRARIES}) endif() -# GLEW / OpenGL -if(WIN32) - add_subdirectory(deps/glew glew) - include_directories(deps/glew/include) - set(LOVR_GL glew) -else() +# OpenGL +if(NOT WIN32) find_package(OpenGL REQUIRED) include_directories(${OPENGL_INCLUDE_DIRS}) set(LOVR_GL ${OPENGL_LIBRARIES}) @@ -163,7 +159,6 @@ target_link_libraries(lovr ${LOVR_LIB}) if(WIN32) move_dll(${LOVR_LUA}) - move_dll(${LOVR_GL}) move_dll(${LOVR_GLFW}) move_dll(${LOVR_PHYSFS}) move_dll(${LOVR_ASSIMP}) diff --git a/src/glfw.h b/src/glfw.h index e58d3fb8..dc97f814 100644 --- a/src/glfw.h +++ b/src/glfw.h @@ -1,3 +1,7 @@ +#ifdef _WIN32 +#define APIENTRY __stdcall +#endif + #include "lib/glad/glad.h" #include