From 79fc639b83b77d715dbe3cac6f9e0c4674a9c161 Mon Sep 17 00:00:00 2001 From: Mathew Velasquez Date: Mon, 7 Mar 2016 17:14:17 -0500 Subject: [PATCH] Build portability fixes and name input issue fix --- mkxp.pro | 4 ++-- scripts/Window_NameInput.rb | 4 ++-- src/gl-debug.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkxp.pro b/mkxp.pro index c90ef2d..313d8fd 100644 --- a/mkxp.pro +++ b/mkxp.pro @@ -45,8 +45,8 @@ contains(BINDING, NULL) { unix { CONFIG += c++11 PKGCONFIG += sigc++-2.0 pixman-1 vorbisfile \ - sdl2 SDL2_image SDL2_ttf SDL_sound - LIBS += -ldl -lphysfs + sdl2 SDL2_image SDL2_ttf SDL_sound physfs + LIBS += -ldl macx: { CONFIG -= app_bundle INCLUDEPATH += $$QMAKE_MAC_SDK_PATH/System/Library/Frameworks/OpenAL.framework/Versions/A/Headers diff --git a/scripts/Window_NameInput.rb b/scripts/Window_NameInput.rb index bdce406..d81dfc9 100644 --- a/scripts/Window_NameInput.rb +++ b/scripts/Window_NameInput.rb @@ -16,8 +16,8 @@ class Window_NameInput < Window_Base @index = 0 # Create dimension information - @character_table = $language.character_table - @group_height = $language.character_table_height + @character_table = $lang.character_table + @group_height = $lang.character_table_height @group_size = @group_height * GROUP_WIDTH @num_groups = @character_table.length / @group_size @start_x = ((width - 32) - @num_groups * 152 + 12) / 2 diff --git a/src/gl-debug.cpp b/src/gl-debug.cpp index a0674b1..e00cc61 100644 --- a/src/gl-debug.cpp +++ b/src/gl-debug.cpp @@ -70,7 +70,7 @@ static void APIENTRY arbDebugFunc(GLenum source, (void) id; (void) length; - if (severity == 0x826B) // GL_DEBUG_SEVERITY_NOTIFICATION + if (severity != GL_DEBUG_SEVERITY_HIGH_ARB) return; p->writeTimestamp();