mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-09-23 10:12:26 +00:00
nuke in-tree stb_image implementation
This commit is contained in:
@@ -1,16 +1,3 @@
|
|||||||
# isolate em
|
|
||||||
_sdl2 = dependency('sdl2')
|
|
||||||
_threads = dependency('threads')
|
|
||||||
_glm = dependency('glm')
|
|
||||||
_defs = []
|
|
||||||
|
|
||||||
if get_option('renderer') == 'gles'
|
|
||||||
_gl = dependency('glesv2', required: true)
|
|
||||||
_defs += ['-DGLES']
|
|
||||||
else
|
|
||||||
_gl = dependency('gl', required: true)
|
|
||||||
endif
|
|
||||||
|
|
||||||
render_sources = files(
|
render_sources = files(
|
||||||
'4J_Render.cpp',
|
'4J_Render.cpp',
|
||||||
'stdafx.cpp',
|
'stdafx.cpp',
|
||||||
@@ -21,8 +8,8 @@ lib_render = static_library(
|
|||||||
'4J_Render',
|
'4J_Render',
|
||||||
render_sources,
|
render_sources,
|
||||||
include_directories: include_directories('.'),
|
include_directories: include_directories('.'),
|
||||||
dependencies: [_sdl2, _gl, _threads, _glm],
|
dependencies: [sdl2_dep, stb_dep, gl_dep, thread_dep, dependency('glm'), stb_dep],
|
||||||
cpp_args: _defs
|
cpp_args: global_cpp_args
|
||||||
+ [
|
+ [
|
||||||
'-fpermissive',
|
'-fpermissive',
|
||||||
'-Wshift-count-overflow',
|
'-Wshift-count-overflow',
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user