From 01927fa9966d3f61910a2fb9e87f31efb26f2a39 Mon Sep 17 00:00:00 2001 From: DepressedTWM Date: Wed, 5 Aug 2026 16:57:25 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B4=D0=B8=D1=82=D0=B5=20=D0=BD=D0=B0?= =?UTF-8?q?=D1=85=D1=83=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 4 ++++ changelogs/0.1.2.txt | 4 ++++ scripts/Data_Settings.rb | 7 +++++++ src/gl-fun.h | 2 +- src/main.cpp | 1 - 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41389b0..595f65b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,7 @@ option(SANITIZERS "Enable sanitizers" OFF) option(NATIVE "Use native instructions(for local use only)" OFF) option(STATIC "Build more static build" OFF) option(CPU_ARCH "CPU arch(x86, arm64, ia-64)" "x86") +option(USE_OPENGL_ES2 "GLES2_HEADER define" OFF) #Configuration set(CMAKE_DISABLE_IN_SOURCE_BUILD TRUE) @@ -21,6 +22,9 @@ if(STATIC) set(ZLIB_USE_STATIC_LIBS ON) set(OPENSSL_USE_STATIC_LIBS ON) endif() +if(USE_OPENGL_ES2) + add_definitions(-DGLES2_HEADER) +endif() # main stuff set(MAIN_HEADERS diff --git a/changelogs/0.1.2.txt b/changelogs/0.1.2.txt index a1b88f8..3298d2d 100644 --- a/changelogs/0.1.2.txt +++ b/changelogs/0.1.2.txt @@ -38,3 +38,7 @@ cg_lightbulb1.png updated cg_lightbulb2.png updated cg_tower5.png updated cg_credits1B.png updated +Fixed bug #21 +Fixed OpenGL ES 2 support +Added CMake option to build engine with OpenGL ES2 instead Desktop GL(why not?) +Added setting that disable some puzzles(For Wayland users) diff --git a/scripts/Data_Settings.rb b/scripts/Data_Settings.rb index 42f8f79..fdb81e3 100644 --- a/scripts/Data_Settings.rb +++ b/scripts/Data_Settings.rb @@ -32,6 +32,7 @@ module Settings :true_memory_mode => false, :oneshot_mode => false, :twm_shader_footprint => true, + :disable_pizzles_for_fuckin_gayland_users_gayland_devs_fix_your_bullshit_already => false, # Advanced :crashlog_privacy => false, @@ -296,6 +297,12 @@ class Window_Settings :icon => [0, 1], :parameter => :twm_shader_footprint }, + { + :type => :bool, + :name => "Disable System API Dependent Puzzles(For wayland users)", + :icon => [0, 1], + :parameter => :disable_pizzles_for_fuckin_gayland_users_gayland_devs_fix_your_bullshit_already + }, ], "Controls" => [ { :type => :sep, :name => "Gamepad" }, diff --git a/src/gl-fun.h b/src/gl-fun.h index a13a9fc..d50aef1 100644 --- a/src/gl-fun.h +++ b/src/gl-fun.h @@ -23,7 +23,7 @@ #define GLFUN_H #ifdef GLES2_HEADER -#include +#include #define APIENTRYP GL_APIENTRYP #else #include diff --git a/src/main.cpp b/src/main.cpp index 725a869..e12ef00 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -357,7 +357,6 @@ int main(int argc, char *argv[]){ /* Load and post key bindings */ rtData.bindingUpdateMsg.post(loadBindings(conf)); - /* Start RGSS thread */ SDL_Thread *rgssThread = SDL_CreateThread(rgssThreadFun, "rgss", &rtData);