MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Trivial config change

Browse source
This commit is contained in:
Varun Patil 2020-05-05 17:43:37 +05:30
parent e4eb6f837d
commit aba490f4d6
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -410,8 +410,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
../pixman-0.40.0/pixman ../pixman-0.40.0/pixman
../physfs-3.0.2/src ../physfs-3.0.2/src
../mruby/include ../mruby/include
../ruby/include #..
../ruby/.ext/include/x86_64-linux
${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS}
#${VORBISFILE_INCLUDE_DIRS} #${VORBISFILE_INCLUDE_DIRS}
@ -423,7 +422,7 @@ target_link_libraries(${PROJECT_NAME}
#ruby-static.a #ruby-static.a
sigc-2.0.a physfs.a SDL_sound.a pixman-1.a sigc-2.0.a physfs.a SDL_sound.a pixman-1.a
#sigc-2.0.x86.a physfs.x86.a SDL_sound.x86.a pixman-1.x86.a #sigc-2.0.x86.a physfs.x86.a SDL_sound.x86.a pixman-1.x86.a
mruby.a mruby.a
@ -448,13 +447,13 @@ target_link_libraries(${PROJECT_NAME}
${PLATFORM_LIBRARIES} ${PLATFORM_LIBRARIES}
) )
SET(EMS_FLAGS " -s USE_SDL=2 -s USE_SDL_IMAGE=2 -s USE_ZLIB=1 -s USE_OGG=1 -s USE_VORBIS=1 -s USE_SDL_TTF=2 --std=c++14 -O3") SET(EMS_FLAGS " -s USE_SDL=2 -s USE_SDL_IMAGE=2 -s USE_ZLIB=1 -s USE_OGG=1 -s USE_VORBIS=1 -s USE_SDL_TTF=2 --std=c++14 -O3 -g0")
SET(ASYNCIFY "-s ASYNCIFY=1 -s 'ASYNCIFY_IMPORTS=[\"load_file_async_js\"]'") SET(ASYNCIFY "-s ASYNCIFY=1 -s 'ASYNCIFY_IMPORTS=[\"load_file_async_js\"]'")
#SET(ERR_FLAGS " -Werror") #SET(ERR_FLAGS " -Werror")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EMS_FLAGS} ${ERR_FLAGS} ${ASYNCIFY}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EMS_FLAGS} ${ERR_FLAGS} ${ASYNCIFY}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EMS_FLAGS} ${ERR_FLAGS} ${ASYNCIFY}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EMS_FLAGS} ${ERR_FLAGS} ${ASYNCIFY}")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EMS_FLAGS} ${ASYNCIFY} -s INITIAL_MEMORY=536870912 -lopenal --preload-file game -s DISABLE_EXCEPTION_CATCHING=1 -s ASSERTIONS=0 -s SAFE_HEAP=0 -s MINIFY_HTML=0 --shell-file shell.html -s ERROR_ON_UNDEFINED_SYMBOLS=1 -s ALLOW_MEMORY_GROWTH=1 --no-heap-copy") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EMS_FLAGS} ${ASYNCIFY} -s INITIAL_MEMORY=536870912 -lopenal --preload-file game -s DISABLE_EXCEPTION_CATCHING=1 -s ASSERTIONS=0 -s SAFE_HEAP=0 -s MINIFY_HTML=0 --shell-file shell.html -s EMULATE_FUNCTION_POINTER_CASTS=0 -s ALLOW_MEMORY_GROWTH=1")
set_target_properties( set_target_properties(
${PROJECT_NAME} ${PROJECT_NAME}

3
src/config.cpp
View file

@ -191,13 +191,14 @@ void Config::read(int argc, char *argv[])
PO_DESC_ALL; PO_DESC_ALL;
gameFolder = "game"; gameFolder = "game";
fixedFramerate = -1; fixedFramerate = 40;
syncToRefreshrate = false; syncToRefreshrate = false;
rgssVersion = 1; rgssVersion = 1;
defScreenW = 640; defScreenW = 640;
defScreenH = 480; defScreenH = 480;
enableBlitting = false; enableBlitting = false;
winResizable = false; winResizable = false;
windowTitle = "KN_E";
#undef PO_DESC #undef PO_DESC
#undef PO_DESC_ALL #undef PO_DESC_ALL