From aba490f4d632eb0da0bff9c9a75527e4b6227a0d Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Tue, 5 May 2020 17:43:37 +0530 Subject: [PATCH] Trivial config change --- CMakeLists.txt | 9 ++++----- src/config.cpp | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b96fdfa..f57c455 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -410,8 +410,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ../pixman-0.40.0/pixman ../physfs-3.0.2/src ../mruby/include - ../ruby/include - ../ruby/.ext/include/x86_64-linux + #.. ${SDL2_INCLUDE_DIRS} #${VORBISFILE_INCLUDE_DIRS} @@ -423,7 +422,7 @@ target_link_libraries(${PROJECT_NAME} #ruby-static.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 @@ -448,13 +447,13 @@ target_link_libraries(${PROJECT_NAME} ${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(ERR_FLAGS " -Werror") 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_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( ${PROJECT_NAME} diff --git a/src/config.cpp b/src/config.cpp index f5bf71a..a782f61 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -191,13 +191,14 @@ void Config::read(int argc, char *argv[]) PO_DESC_ALL; gameFolder = "game"; - fixedFramerate = -1; + fixedFramerate = 40; syncToRefreshrate = false; rgssVersion = 1; defScreenW = 640; defScreenH = 480; enableBlitting = false; winResizable = false; + windowTitle = "KN_E"; #undef PO_DESC #undef PO_DESC_ALL