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

Fix for x86

Browse source
This commit is contained in:
Varun Patil 2020-05-05 01:37:18 +05:30
parent 3f42fac8f5
commit c9af091331
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -414,7 +414,8 @@ 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}
@ -439,6 +440,8 @@ target_link_libraries(${PROJECT_NAME}
#pixman-1.x86.a #pixman-1.x86.a
#crypt #crypt
#dl #dl
#pthread
#rt
${SDL2_LIBRARIES} ${SDL2_LIBRARIES}
${SDL2_IMAGE_LIBRARIES} ${SDL2_IMAGE_LIBRARIES}
@ -455,13 +458,14 @@ 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 -O2 -g -s ASYNCIFY=1") 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(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}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EMS_FLAGS} ${ERR_FLAGS} ${ASYNCIFY}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EMS_FLAGS} ${ERR_FLAGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EMS_FLAGS} ${ERR_FLAGS} ${ASYNCIFY}")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EMS_FLAGS} -s TOTAL_MEMORY=1073741824 -lopenal --preload-file game -s DISABLE_EXCEPTION_CATCHING=1 -s ASSERTIONS=0 -s SAFE_HEAP=0 -s MINIFY_HTML=0 -s 'ASYNCIFY_IMPORTS=[\"load_file_async_js\"]' --shell-file shell.html") 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_target_properties( set_target_properties(
${PROJECT_NAME} ${PROJECT_NAME}

4
src/emscripten.cpp
View file

@ -2,6 +2,8 @@
#include "filesystem.h" #include "filesystem.h"
#include "sharedstate.h" #include "sharedstate.h"
#ifdef __EMSCRIPTEN__
EM_JS(void, load_file_async_js, (const char* fullPathC), { EM_JS(void, load_file_async_js, (const char* fullPathC), {
Asyncify.handleSleep(function(wakeUp) { Asyncify.handleSleep(function(wakeUp) {
// Get argument // Get argument
@ -55,3 +57,5 @@ void load_file_async(const char * filename) {
shState->fileSystem().openRead(handler, filename); shState->fileSystem().openRead(handler, filename);
} }
#endif