Skip to content

Commit 14cfc8c

Browse files
committed
Vendor GLAD ES2 headers, update vcpkg
1 parent ebe2fb4 commit 14cfc8c

9 files changed

Lines changed: 2893 additions & 22 deletions

File tree

CMakeLists.txt

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ add_library(SimpleGraphic SHARED
7575

7676
target_compile_definitions(SimpleGraphic
7777
PRIVATE
78+
"GLFW_INCLUDE_NONE"
7879
"GL_SILENCE_DEPRECATION"
7980
"SIMPLEGRAPHIC_EXPORTS"
8081
)
@@ -85,14 +86,17 @@ target_include_directories(SimpleGraphic
8586
"${CMAKE_CURRENT_SOURCE_DIR}/engine"
8687
)
8788

89+
find_package(unofficial-angle CONFIG REQUIRED)
8890
find_package(fmt CONFIG REQUIRED)
8991
find_package(glfw3 CONFIG REQUIRED)
9092
find_package(LuaJit REQUIRED)
91-
find_package(OpenGL REQUIRED)
93+
find_package(re2 CONFIG REQUIRED)
94+
find_package(Threads REQUIRED)
9295
find_package(ZLIB REQUIRED)
9396

9497
target_include_directories(SimpleGraphic
9598
PRIVATE
99+
${CMAKE_CURRENT_SOURCE_DIR}/dep/glad/include
96100
${JPEG_INCLUDE_DIR}
97101
${LUAJIT_INCLUDE_DIR}
98102
)
@@ -104,6 +108,13 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
104108
)
105109
endif ()
106110

111+
if (WIN32)
112+
target_link_libraries(SimpleGraphic
113+
PRIVATE
114+
"winmm.lib"
115+
)
116+
endif ()
117+
107118
if (APPLE)
108119
find_library(CORE_FOUNDATION_LIBRARY CoreFoundation)
109120
find_library(APPLICATION_SERVICES_LIBRARY ApplicationServices)
@@ -116,9 +127,12 @@ endif ()
116127

117128
target_link_libraries(SimpleGraphic
118129
PRIVATE
130+
unofficial::angle::libEGL
131+
unofficial::angle::libGLESv2
119132
fmt::fmt
120133
glfw
121134
${LUAJIT_LIBRARIES}
122-
OpenGL::GL
135+
re2::re2
136+
Threads::Threads
123137
ZLIB::ZLIB
124138
)

0 commit comments

Comments
 (0)