38 lines
2.1 KiB
Diff
38 lines
2.1 KiB
Diff
diff -uNr OpenTTD-1.9.1/Makefile.setting.in OpenTTD-1.9.1.mod/Makefile.setting.in
|
|
--- OpenTTD-1.9.1/Makefile.setting.in 2019-04-08 22:37:59.000000000 +0300
|
|
+++ OpenTTD-1.9.1.mod/Makefile.setting.in 2019-06-30 00:06:14.541653021 +0300
|
|
@@ -27,27 +27,27 @@
|
|
|
|
settingsgen.o: $(SRC_DIR)/settingsgen/settingsgen.cpp $(SRC_DIR)/string_func.h $(SRC_DIR)/strings_type.h $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/ini_type.h $(SRC_DIR)/core/smallvec_type.hpp $(SRC_DIR)/safeguards.h
|
|
$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
|
|
- $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
|
|
+ $(Q)g++ -DSETTINGSGEN -c -o $@ $<
|
|
|
|
alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp $(SRC_DIR)/safeguards.h
|
|
$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
|
|
- $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
|
|
+ $(Q)g++ -DSETTINGSGEN -c -o $@ $<
|
|
|
|
getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/safeguards.h
|
|
$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
|
|
- $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
|
|
+ $(Q)g++ -DSETTINGSGEN -c -o $@ $<
|
|
|
|
string.o: $(SRC_DIR)/string.cpp $(SRC_DIR)/safeguards.h
|
|
$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
|
|
- $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
|
|
+ $(Q)g++ -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 $(SRC_DIR)/safeguards.h
|
|
$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
|
|
- $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
|
|
+ $(Q)g++ -DSETTINGSGEN -c -o $@ $<
|
|
|
|
$(SETTINGSGEN): alloc_func.o string.o ini_load.o settingsgen.o getoptdata.o
|
|
$(E) '$(STAGE) Compiling and Linking $@'
|
|
- $(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
|
|
+ $(Q)g++ $^ -o $@
|
|
|
|
table/settings.h: $(SETTINGSGEN) $(SRC_DIR)/table/settings.h.preamble $(SRC_DIR)/table/settings.h.postamble $(SRC_DIR)/table/*.ini
|
|
$(E) '$(STAGE) Generating $@'
|