snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build portability fixes and name input issue fix

This commit is contained in:
Mathew Velasquez 2016-03-07 17:14:17 -05:00
parent 7275291e7d
commit 79fc639b83
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkxp.pro
View File

@ -45,8 +45,8 @@ contains(BINDING, NULL) {
unix { unix {
CONFIG += c++11 CONFIG += c++11
PKGCONFIG += sigc++-2.0 pixman-1 vorbisfile \ PKGCONFIG += sigc++-2.0 pixman-1 vorbisfile \
sdl2 SDL2_image SDL2_ttf SDL_sound sdl2 SDL2_image SDL2_ttf SDL_sound physfs
LIBS += -ldl -lphysfs LIBS += -ldl
macx: { macx: {
CONFIG -= app_bundle CONFIG -= app_bundle
INCLUDEPATH += $$QMAKE_MAC_SDK_PATH/System/Library/Frameworks/OpenAL.framework/Versions/A/Headers INCLUDEPATH += $$QMAKE_MAC_SDK_PATH/System/Library/Frameworks/OpenAL.framework/Versions/A/Headers

4
scripts/Window_NameInput.rb
View File

@ -16,8 +16,8 @@ class Window_NameInput < Window_Base
@index = 0 @index = 0
# Create dimension information # Create dimension information
@character_table = $language.character_table @character_table = $lang.character_table
@group_height = $language.character_table_height @group_height = $lang.character_table_height
@group_size = @group_height * GROUP_WIDTH @group_size = @group_height * GROUP_WIDTH
@num_groups = @character_table.length / @group_size @num_groups = @character_table.length / @group_size
@start_x = ((width - 32) - @num_groups * 152 + 12) / 2 @start_x = ((width - 32) - @num_groups * 152 + 12) / 2

2
src/gl-debug.cpp
View File

@ -70,7 +70,7 @@ static void APIENTRY arbDebugFunc(GLenum source,
(void) id; (void) id;
(void) length; (void) length;
if (severity == 0x826B) // GL_DEBUG_SEVERITY_NOTIFICATION if (severity != GL_DEBUG_SEVERITY_HIGH_ARB)
return; return;
p->writeTimestamp(); p->writeTimestamp();