Remove basically pointless build options

Author: Struma

binding/binding-mri.cpp

@@ -874,8 +874,6 @@ static void runRMXPScripts(BacktraceData &btData) {
         rb_ary_store(script, 3, rb_utf8_str_new_cstr(decodeBuffer.c_str()));
     }
 
-    // Can be force-disabled similarly to framerate options
-#ifndef MKXPZ_NO_PRELOADSCRIPTS
     /* Execute preloaded scripts */
     for (std::vector<std::string>::const_iterator i = conf.preloadScripts.begin();
          i != conf.preloadScripts.end(); ++i)
@@ -944,7 +942,6 @@ static void runRMXPScripts(BacktraceData &btData) {
         processReset();
     }
 }
-#endif
 
 // Attempts to set $stdout and $stdin accordingly on Windows. Only
 // called when debug mode is on, since that's when the console

binding/meson.build

@@ -12,10 +12,6 @@ else
     global_dependencies += compilers['cpp'].find_library(get_option('mri_library'), dirs: get_option('mri_libpath'))
 endif
 
-if get_option('no_preload_scripts') == true
-    add_project_arguments('-DMKXPZ_NO_PRELOADSCRIPTS', language: ['cpp','objc','objcpp'])
-endif
-
 global_include_dirs += include_directories('.')
 
 binding_source = [files(

meson_options.txt

@@ -9,8 +9,6 @@ option('shared_fluid', type: 'boolean', value: true, description: 'Dynamically l
 option('cjk_fallback_font', type: 'boolean', value: false, description: 'Use WenQuanYi Micro Hei as the fallback font')
 option('use_miniffi', type: 'boolean', value: true, description: 'Enable MiniFFI Ruby module (Win32API)')
 option('enable-https', type: 'boolean', value: true, description: 'Support HTTPS for get/post requests. Requires OpenSSL.')
-option('default_framerate', type: 'boolean', value: false, description: 'Disable syncToRefreshrate and fixedFramerate configuration options')
-option('no_preload_scripts', type: 'boolean', value: false, description: 'Disable the preloadScript configuration option')
 option('workdir_current', type: 'boolean', value: false, description: 'Keep current directory on startup')
 
 option('static_executable', type: 'boolean', value: true, description: 'Build a static executable (Windows-only)')

mkxp.json

@@ -93,7 +93,6 @@
 
 
     // Enforce a static frame rate
-    // This option may be force-disabled at build time.
     // (0 = disabled)
     //
     // "fixedFramerate": 0,
@@ -208,7 +207,6 @@
 
     // Define raw scripts to be executed before the
     // actual Scripts.rxdata execution starts
-    // This option may be force-disabled at build time.
     // (default: none)
     //
     // "preloadScript": ["my_win32_wrapper.rb",

src/display/graphics.cpp

@@ -622,11 +622,6 @@ struct GraphicsPrivate {
 
 Graphics::Graphics(RGSSThreadData *data) {
     p = new GraphicsPrivate(data);
-    // To appease people who don't want players to have
-    // emulator-like speedups
-    // Nothing stops anybody from building with this
-    // enabled though and I'm not removing this stuff
-#ifndef MKXPZ_STATIC_FRAMERATE
     if (data->config.syncToRefreshrate) {
         p->frameRate = data->refreshRate;
 #if defined(__APPLE__) && defined(GLES2_HEADER)
@@ -641,7 +636,6 @@ Graphics::Graphics(RGSSThreadData *data) {
     } else if (data->config.fixedFramerate < 0) {
         p->fpsLimiter.disabled = true;
     }
-#endif
 }
 
 Graphics::~Graphics() { delete p; }

src/meson.build

@@ -96,10 +96,6 @@ if get_option('shared_fluid') == true
     endif
 endif
 
-if get_option('default_framerate') == true
-    add_project_arguments('-DMKXPZ_STATIC_FRAMERATE', language: 'cpp')
-endif
-
 if get_option('cjk_fallback_font') == true
     add_project_arguments('-DMKXPZ_CJK_FONT', language: 'cpp')
 endif