diff --git a/Makefile b/Makefile
index 160cffd948..a4f0a39073 100644
--- a/Makefile
+++ b/Makefile
@@ -55,9 +55,6 @@ ifeq ($(DEBUG), 1)
    OPTIMIZE_FLAG = -O0 -g
 else
    OPTIMIZE_FLAG = -O3 -ffast-math
-   ifneq ($(findstring Win32,$(OS)),)
-      LDFLAGS += -mwindows
-   endif
 endif
 
 CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I.
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 310b234568..feb7cd3551 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -37,13 +37,17 @@ endif
 #if you compile with SDL2 flag add this Emscripten flag "-s USE_SDL=2" to LDFLAGS:
 
 LIBS    := -s USE_SDL=2 -s USE_ZLIB=1
-LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s ASYNCIFY=$(ASYNC) -s USE_PTHREADS=$(PTHREAD) \
+LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) \
            -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
            --js-library emscripten/library_rwebaudio.js \
            --js-library emscripten/library_rwebinput.js \
            --js-library emscripten/library_rwebcam.js
 ifneq ($(PTHREAD), 0)
-   LDFLAGS += -s PTHREAD_POOL_SIZE=2
+   LDFLAGS += -s USE_PTHREADS=$(PTHREAD) -s PTHREAD_POOL_SIZE=2
+endif
+
+ifneq ($(ASYNC), 0)
+   LDFLAGS += -s ASYNCIFY=$(ASYNC)
 endif  
 
 include Makefile.common