diff --git a/Makefile.setting.in b/Makefile.setting.in --- a/Makefile.setting.in +++ b/Makefile.setting.in @@ -44,10 +44,10 @@ string.o: $(SRC_DIR)/string.cpp endian_h $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $< ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h - $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)' + $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)' $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $< -$(SETTINGSGEN): alloc_func.o ini_load.o settingsgen.o getoptdata.o string.o +$(SETTINGSGEN): alloc_func.o string.o ini_load.o settingsgen.o getoptdata.o $(E) '$(STAGE) Compiling and Linking $@' $(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@ diff --git a/config.lib b/config.lib --- a/config.lib +++ b/config.lib @@ -1420,7 +1420,7 @@ make_cflags_and_ldflags() { LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32" if [ $cc_version -ge 44 ]; then - LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc" + LDFLAGS_BUILD="$LDFLAGS_BUILD -static-libgcc -static-libstdc++" fi fi fi