diff options
| author | smatz <smatz@openttd.org> | 2009-06-01 11:49:46 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-06-01 11:49:46 +0000 |
| commit | c03ce4b1c704ef638374f56bbb9692db0e4e354c (patch) | |
| tree | 72c24a2c268425261ae4e01f9900cedef22ecc26 /Makefile.src.in | |
| parent | bab70a823dd810e1d4477f0c01d3a7b3e9b19ac8 (diff) | |
| download | openttd-c03ce4b1c704ef638374f56bbb9692db0e4e354c.tar.xz | |
(svn r16492) -Remove: support for gcc2. It hasn't been able to compile OTTD for months. All attempts to do another workaround failed.
Diffstat (limited to 'Makefile.src.in')
| -rw-r--r-- | Makefile.src.in | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/Makefile.src.in b/Makefile.src.in index 55232fafd..044aea3a6 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -29,7 +29,6 @@ CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!! SORT = !!SORT!! REVISION = !!REVISION!! AWK = !!AWK!! -GCC295 = !!GCC295!! CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!! CONFIG_CACHE_LINKER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!! CONFIG_CACHE_ENDIAN = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!! @@ -54,20 +53,6 @@ CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR) -I $(SCRIPT_SRC_DIR) ENDIAN_TARGETS := endian_target.h $(ENDIAN_CHECK) -# This 'sed' basicly just removes 'const' from the line if it is a 2+D array -# For more information, please check: -# http://maillist.openttd.org/pipermail/devs/2007-April/000284.html -# http://maillist.openttd.org/pipermail/devs/2007-February/000248.html -GCC295_FIX=sed -r 's@^(\t*)(.*)( const )([A-Za-z0-9_ ]+(\[.*\]){2,})(( = \{)|(;))(.*)$$@\1\2 \4\6\8\9@g' -# This 'sed' removes the 3rd '4' in the # lines of the -E output of -# gcc 2.95.3 and lower, as it should indicate that it is a C-linkage, but the -# compiler can't handle that information (just don't ask). So we remove it -# and then it compiles happily and without bitching :) -# Furthermore gcc 2.95 has some trouble with protected and private when -# accessing the protected/private stuff of the enclosing class (or the -# super class of the enclosing class). -GCC295_FIX_2=sed -e 's@\(^\# [0-9][0-9]* "[^"]*"[ 0-9]*\) 4$$@\1@g;s@private:@public:@g;s@protected:@public:@g' - # Check if we want to show what we are doing ifdef VERBOSE Q = @@ -240,11 +225,7 @@ $(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP) $(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP) $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)' -ifeq ($(GCC295), 1) - $(Q)$(CXX_HOST) -E $(CFLAGS) $< | $(GCC295_FIX) | $(GCC295_FIX_2) | $(CXX_HOST) $(CFLAGS) -c -o $@ -x c++ - -else $(Q)$(CXX_HOST) $(CFLAGS) -c -o $@ $< -endif $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP) $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)' |