diff options
| author | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
| commit | f35ed4bbc2b05f1b83476b60948d64375f77f1b4 (patch) | |
| tree | 1a1c59c13ddb1d152052f3a3a0bcffe4fb531173 /Makefile.lang.in | |
| parent | a332d10fd938f345fff18e5f4a662a58f692f734 (diff) | |
| download | openttd-f35ed4bbc2b05f1b83476b60948d64375f77f1b4.tar.xz | |
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
Diffstat (limited to 'Makefile.lang.in')
| -rw-r--r-- | Makefile.lang.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.lang.in b/Makefile.lang.in index b4a276da3..98d2250a3 100644 --- a/Makefile.lang.in +++ b/Makefile.lang.in @@ -7,7 +7,7 @@ LANG_DIR = !!LANG_DIR!! BIN_DIR = !!BIN_DIR!! LANGS_SRC = $(shell ls $(LANG_DIR)/*.txt) LANGS = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng) -CC_BUILD = !!CC_BUILD!! +CXX_BUILD = !!CXX_BUILD!! CFLAGS_BUILD = !!CFLAGS_BUILD!! STRGEN_FLAGS = !!STRGEN_FLAGS!! STAGE = !!STAGE!! @@ -36,13 +36,13 @@ RES := $(shell mkdir -p $(BIN_DIR)/lang ) all: table/strings.h $(LANGS) -strgen.o: $(SRC_DIR)/strgen/strgen.c endian_host.h - $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)' - $(Q)$(CC_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $< +strgen.o: $(SRC_DIR)/strgen/strgen.cpp endian_host.h + $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)' + $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $< -string.o: $(SRC_DIR)/string.c endian_host.h - $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)' - $(Q)$(CC_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $< +string.o: $(SRC_DIR)/string.cpp endian_host.h + $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)' + $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $< lang/english.txt: $(LANG_DIR)/english.txt $(Q)mkdir -p lang @@ -50,7 +50,7 @@ lang/english.txt: $(LANG_DIR)/english.txt $(STRGEN): string.o strgen.o $(E) '$(STAGE) Compiling and Linking $@' - $(Q)$(CC_BUILD) string.o strgen.o -o $@ + $(Q)$(CXX_BUILD) string.o strgen.o -o $@ table/strings.h: lang/english.txt $(STRGEN) $(E) '$(STAGE) Generating $@' @@ -67,9 +67,9 @@ endian_host.h: $(ENDIAN_CHECK) $(E) '$(STAGE) Testing endianness for host' $(Q)./$(ENDIAN_CHECK) > $@ -$(ENDIAN_CHECK): $(SRC_DIR)/endian_check.c +$(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp $(E) '$(STAGE) Compiling and Linking $@' - $(Q)$(CC_BUILD) $(CFLAGS_BUILD) $< -o $@ + $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@ depend: |