Mercurial > hg > openttd

changeset 17429:2dc9702a19cf draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22180) -Fix: when using -static-libgcc, also use -static-libstdc++
author glx <glx@openttd.org>
date Fri, 04 Mar 2011 00:27:17 +0000
parents 524458e6cbc2
children 5c204fdd9ddb
files Makefile.setting.in config.lib
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.setting.in
+++ b/Makefile.setting.in
@@ -44,10 +44,10 @@
 	$(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 $@
 
--- a/config.lib
+++ b/config.lib
@@ -1420,7 +1420,7 @@
 			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