mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-19 13:29:54 +00:00
Идите нахуй
This commit is contained in:
parent
09c46efc67
commit
01927fa996
5 changed files with 16 additions and 2 deletions
|
|
@ -9,6 +9,7 @@ option(SANITIZERS "Enable sanitizers" OFF)
|
||||||
option(NATIVE "Use native instructions(for local use only)" OFF)
|
option(NATIVE "Use native instructions(for local use only)" OFF)
|
||||||
option(STATIC "Build more static build" OFF)
|
option(STATIC "Build more static build" OFF)
|
||||||
option(CPU_ARCH "CPU arch(x86, arm64, ia-64)" "x86")
|
option(CPU_ARCH "CPU arch(x86, arm64, ia-64)" "x86")
|
||||||
|
option(USE_OPENGL_ES2 "GLES2_HEADER define" OFF)
|
||||||
|
|
||||||
#Configuration
|
#Configuration
|
||||||
set(CMAKE_DISABLE_IN_SOURCE_BUILD TRUE)
|
set(CMAKE_DISABLE_IN_SOURCE_BUILD TRUE)
|
||||||
|
|
@ -21,6 +22,9 @@ if(STATIC)
|
||||||
set(ZLIB_USE_STATIC_LIBS ON)
|
set(ZLIB_USE_STATIC_LIBS ON)
|
||||||
set(OPENSSL_USE_STATIC_LIBS ON)
|
set(OPENSSL_USE_STATIC_LIBS ON)
|
||||||
endif()
|
endif()
|
||||||
|
if(USE_OPENGL_ES2)
|
||||||
|
add_definitions(-DGLES2_HEADER)
|
||||||
|
endif()
|
||||||
|
|
||||||
# main stuff
|
# main stuff
|
||||||
set(MAIN_HEADERS
|
set(MAIN_HEADERS
|
||||||
|
|
|
||||||
|
|
@ -38,3 +38,7 @@ cg_lightbulb1.png updated
|
||||||
cg_lightbulb2.png updated
|
cg_lightbulb2.png updated
|
||||||
cg_tower5.png updated
|
cg_tower5.png updated
|
||||||
cg_credits1B.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)
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ module Settings
|
||||||
:true_memory_mode => false,
|
:true_memory_mode => false,
|
||||||
:oneshot_mode => false,
|
:oneshot_mode => false,
|
||||||
:twm_shader_footprint => true,
|
:twm_shader_footprint => true,
|
||||||
|
:disable_pizzles_for_fuckin_gayland_users_gayland_devs_fix_your_bullshit_already => false,
|
||||||
|
|
||||||
# Advanced
|
# Advanced
|
||||||
:crashlog_privacy => false,
|
:crashlog_privacy => false,
|
||||||
|
|
@ -296,6 +297,12 @@ class Window_Settings
|
||||||
:icon => [0, 1],
|
:icon => [0, 1],
|
||||||
:parameter => :twm_shader_footprint
|
: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" => [
|
"Controls" => [
|
||||||
{ :type => :sep, :name => "Gamepad" },
|
{ :type => :sep, :name => "Gamepad" },
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
#define GLFUN_H
|
#define GLFUN_H
|
||||||
|
|
||||||
#ifdef GLES2_HEADER
|
#ifdef GLES2_HEADER
|
||||||
#include <SDL_opengles2.h>
|
#include <SDL3/SDL_opengles2.h>
|
||||||
#define APIENTRYP GL_APIENTRYP
|
#define APIENTRYP GL_APIENTRYP
|
||||||
#else
|
#else
|
||||||
#include <SDL3/SDL_opengl.h>
|
#include <SDL3/SDL_opengl.h>
|
||||||
|
|
|
||||||
|
|
@ -357,7 +357,6 @@ int main(int argc, char *argv[]){
|
||||||
|
|
||||||
/* Load and post key bindings */
|
/* Load and post key bindings */
|
||||||
rtData.bindingUpdateMsg.post(loadBindings(conf));
|
rtData.bindingUpdateMsg.post(loadBindings(conf));
|
||||||
|
|
||||||
/* Start RGSS thread */
|
/* Start RGSS thread */
|
||||||
SDL_Thread *rgssThread = SDL_CreateThread(rgssThreadFun, "rgss", &rtData);
|
SDL_Thread *rgssThread = SDL_CreateThread(rgssThreadFun, "rgss", &rtData);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue