LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-23 09:12:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor meson and final gles support, cleaner gdraw

Browse Source
This commit is contained in:
JuiceyDev
2026-03-29 20:55:58 -05:00
committed by Tropical
parent a2ec6610a5
commit d2e77c63ad
4 changed files with 179 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+30 -13
View File
@@ -18,6 +18,8 @@ python = pymod.find_installation('python3', required: true)
cc = meson.get_compiler('cpp')
use_gles = get_option('gles')
global_cpp_defs = [
'-DSPLIT_SAVES',
'-D_LARGE_WORLDS',
@@ -28,11 +30,23 @@ global_cpp_defs = [
]
if host_machine.system() == 'linux'
global_cpp_defs += [
'-Dlinux',
'-D__linux',
'-D__linux__',
]
global_cpp_defs += ['-Dlinux', '-D__linux', '-D__linux__']
endif
if use_gles
global_cpp_defs += ['-DGLES']
endif
if get_option('enable_vsync')
global_cpp_defs += ['-DENABLE_VSYNC']
endif
if get_option('enable_shiggy')
global_cpp_defs += ['-D_ENABLEIGGY']
endif
if get_option('enable_java_guis')
global_cpp_defs += ['-DENABLE_JAVA_GUIS']
endif
add_project_arguments(global_cpp_defs, language: ['cpp', 'c'])
@@ -48,12 +62,13 @@ sdl2_dep = dependency('sdl2')
thread_dep = dependency('threads')
dl_dep = cc.find_library('dl', required: true)
if '-DGLES' in global_cpp_defs
gl_dep = dependency('glesv2')
# GLES vs Desktop GL
if use_gles
gl_dep = dependency('glesv2', required: true)
glu_dep = dependency('', required: false)
else
gl_dep = dependency('gl')
glu_dep = dependency('glu')
gl_dep = dependency('gl', required: true)
glu_dep = dependency('glu', required: true)
endif
stb = subproject('stb').get_variable('stb_inc')
@@ -61,10 +76,12 @@ stb_dep = declare_dependency(include_directories: stb)
miniaudio_dep = dependency('miniaudio')
render_dep = dependency('4j-render', fallback: ['4jlibs', 'render_dep'])
input_dep = dependency('4j-input', fallback: ['4jlibs', 'input_dep'])
profile_dep = dependency('4j-profile', fallback: ['4jlibs', 'profile_dep'])
storage_dep = dependency('4j-storage', fallback: ['4jlibs', 'storage_dep'])
sub_opts = ['gles=' + use_gles.to_string()]
render_dep = dependency('4j-render', fallback: ['4jlibs', 'render_dep'], default_options: sub_opts)
input_dep = dependency('4j-input', fallback: ['4jlibs', 'input_dep'], default_options: sub_opts)
profile_dep = dependency('4j-profile', fallback: ['4jlibs', 'profile_dep'], default_options: sub_opts)
storage_dep = dependency('4j-storage', fallback: ['4jlibs', 'storage_dep'], default_options: sub_opts)
all_deps = [
gl_dep,