Skip to content

Commit 44f2951

Browse files
authored
Merge pull request #66 from zao/feat/image-loading
feat: texture splitting/stacking, DDS images, GLES3.0
2 parents 50ea594 + f005ccb commit 44f2951

21 files changed

+2490
-826
lines changed

CMakeLists.txt

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,16 @@ set(SIMPLEGRAPHIC_SOURCES
3636
"engine/common/memtrak3.h"
3737
"engine/common/streams.cpp"
3838
"engine/common/streams.h"
39+
"engine/core/core_compress.cpp"
40+
"engine/core/core_compress.h"
3941
"engine/core/core_config.cpp"
4042
"engine/core/core_config.h"
4143
"engine/core/core_image.cpp"
4244
"engine/core/core_image.h"
4345
"engine/core/core_main.cpp"
4446
"engine/core/core_main.h"
47+
"engine/core/core_tex_manipulation.cpp"
48+
"engine/core/core_tex_manipulation.h"
4549
"engine/core/core_video.cpp"
4650
"engine/core/core_video.h"
4751
"engine/render/r_font.cpp"
@@ -107,11 +111,17 @@ find_package(unofficial-angle CONFIG REQUIRED)
107111
find_package(CURL CONFIG REQUIRED)
108112
find_package(fmt CONFIG REQUIRED)
109113
find_package(glfw3 CONFIG REQUIRED)
114+
find_package(gli CONFIG REQUIRED)
110115
find_package(LuaJIT REQUIRED)
116+
find_package(Microsoft.GSL CONFIG REQUIRED)
117+
find_package(PkgConfig REQUIRED)
111118
find_package(re2 CONFIG REQUIRED)
119+
find_package(sol2 CONFIG REQUIRED)
112120
find_package(Threads REQUIRED)
121+
find_package(zstd REQUIRED)
113122
find_package(ZLIB REQUIRED)
114123

124+
115125
add_library(imgui STATIC
116126
dep/imgui/imconfig.h
117127
dep/imgui/imgui.cpp
@@ -195,12 +205,16 @@ target_link_libraries(SimpleGraphic
195205
unofficial::angle::libGLESv2
196206
fmt::fmt
197207
glfw
208+
gli
198209
glm::glm
199210
imgui
200211
LuaJIT::LuaJIT
212+
Microsoft.GSL::GSL
201213
re2::re2
214+
sol2
202215
Threads::Threads
203216
ZLIB::ZLIB
217+
zstd::libzstd_shared
204218
)
205219

206220
install(FILES $<TARGET_RUNTIME_DLLS:SimpleGraphic> DESTINATION ".")
@@ -214,7 +228,7 @@ if (WIN32)
214228
PATHS "${DEPS_DIR}" PATH_SUFFIXES "debug/bin" REQUIRED NO_DEFAULT_PATH)
215229
find_file(ZLIB_DLL_DEBUG NAMES "zlibd1.dll"
216230
PATHS "${DEPS_DIR}" PATH_SUFFIXES "debug/bin" REQUIRED NO_DEFAULT_PATH)
217-
231+
218232
install(FILES
219233
${LuaJIT_DLL_DEBUG}
220234
${ZLIB_DLL_DEBUG}
@@ -226,8 +240,7 @@ if (WIN32)
226240
find_file(LuaJIT_DLL_RELEASE NAMES "lua51.dll"
227241
PATHS "${DEPS_DIR}" PATH_SUFFIXES "bin" REQUIRED NO_DEFAULT_PATH)
228242
find_file(ZLIB_DLL_RELEASE NAMES "zlib1.dll"
229-
PATHS "${DEPS_DIR}" PATH_SUFFIXES "bin" REQUIRED NO_DEFAULT_PATH
230-
)
243+
PATHS "${DEPS_DIR}" PATH_SUFFIXES "bin" REQUIRED NO_DEFAULT_PATH)
231244

232245
install(FILES
233246
${LuaJIT_DLL_RELEASE}

0 commit comments

Comments
 (0)