diff --git a/Makefile.win32 b/Makefile.win32
index 42b3274903..4afd0a81a0 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -24,7 +24,8 @@ libsnes ?= -lsnes
 
 LIBS = -lm
 DEFINES = -I. -DHAVE_CONFIGFILE
-LDFLAGS = -L. -static-libgcc -static-libstdc++ -s
+LDFLAGS = -L. -static-libgcc -s
+LDCXXFLAGS = -static-libstdc++
 
 SDL_LIBS = -lSDL
 SDL_CFLAGS = -ISDL
@@ -128,7 +129,7 @@ CXXFLAGS += -Wall -O3 -pedantic -I.
 all: $(TARGET) $(JTARGET)
 
 $(TARGET): $(OBJ)
-	$(Q)$(CXX) -o $@ $(OBJ) $(LIBS) $(LDFLAGS)
+	$(Q)$(CXX) -o $@ $(OBJ) $(LIBS) $(LDFLAGS) $(LDCXXFLAGS)
 	@$(if $(Q), $(shell echo echo LD $@),)
 
 %.o: %.c
diff --git a/Makefile.win64 b/Makefile.win64
index 70d7170379..480977c653 100644
--- a/Makefile.win64
+++ b/Makefile.win64
@@ -23,7 +23,8 @@ libsnes ?= -lsnes
 
 LIBS = -lm
 DEFINES = -I. -DHAVE_CONFIGFILE
-LDFLAGS = -L. -static-libgcc -static-libstdc++ -s
+LDFLAGS = -L. -static-libgcc -s
+LDCXXFLAGS = -static-libstdc++
 
 SDL_LIBS = -lSDL
 SDL_CFLAGS = -ISDL
@@ -123,7 +124,7 @@ CXXFLAGS += -Wall -O3 -I.
 all: $(TARGET) $(JTARGET)
 
 $(TARGET): $(OBJ)
-	$(Q)$(CXX) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
+	$(Q)$(CXX) -o $@ $(LDFLAGS) $(OBJ) $(LIBS) $(LDCXXFLAGS)
 	@$(if $(Q), $(shell echo echo LD $@),)
 
 %.o: %.c