From: DeaDDooMER Date: Fri, 15 May 2020 15:34:41 +0000 (+0300) Subject: build: fix emscripten X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=c0bb00824a48b78aee7140e3fa89ac69d59d7296;p=flatwaifu.git build: fix emscripten --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9028b81..d91997e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -155,8 +155,8 @@ if(D2D_FOR_EMSCRIPTEN) set(D2D_DOOM2D_WAD doom2d.wad) configure_file(${D2D_GAME_ROOT}/default.cfg default.cfg COPYONLY) set(D2D_DEFAULT_CFG default.cfg) - set(D2D_USED_LINKFLAGS ${D2D_SYSTEM_LINKFLAGS} ${D2D_RENDER_LINKFLAGS} ${D2D_SOUND_LINKFLAGS}) - set_target_properties(doom2d PROPERTIES LINK_FLAGS "-s WASM=0 -s DISABLE_EXCEPTION_CATCHING=1 -s SAFE_HEAP=1 -s ASSERTIONS=1 -s GL_ASSERTIONS=1 ${D2D_USED_LINKFLAGS} --preload-file ${D2D_DOOM2D_WAD} --preload-file ${D2D_DEFAULT_CFG}") + set(D2D_USED_LINKFLAGS "${D2D_SYSTEM_LINKFLAGS} ${D2D_RENDER_LINKFLAGS} ${D2D_SOUND_LINKFLAGS}") + set_target_properties(doom2d PROPERTIES LINK_FLAGS "-s WASM=0 -s MINIFY_HTML=0 -s DISABLE_EXCEPTION_CATCHING=1 -s SAFE_HEAP=1 -s ASSERTIONS=1 -s GL_ASSERTIONS=0 ${D2D_USED_LINKFLAGS} --preload-file ${D2D_DOOM2D_WAD} --preload-file ${D2D_DEFAULT_CFG}") else() target_link_libraries(doom2d ${D2D_USED_LIBRARY}) endif() diff --git a/src/gl/render.c b/src/gl/render.c index e38e63c..68ab733 100644 --- a/src/gl/render.c +++ b/src/gl/render.c @@ -1353,7 +1353,6 @@ static void R_draw_smoke (void) { static void R_draw_effects (void) { enum {NONE, TFOG, IFOG, BUBL}; // copypasted from fx.c int i, s; - glPointSize(screen_scale); for (i = 0; i < MAXFX; ++i) { switch (fx[i].t) { case TFOG: