equal
deleted
inserted
replaced
92 @for dir in $(SRC_DIRS); do \ |
92 @for dir in $(SRC_DIRS); do \ |
93 $(MAKE) -C $$dir depend; \ |
93 $(MAKE) -C $$dir depend; \ |
94 done |
94 done |
95 |
95 |
96 run: all |
96 run: all |
97 $(Q)cd !!BIN_DIR!! && ./!!TTD!! |
97 $(Q)cd !!BIN_DIR!! && ./!!TTD!! $(OPENTTD_ARGS) |
|
98 |
|
99 run-gdb: all |
|
100 $(Q)cd !!BIN_DIR!! && gdb --ex run --args ./!!TTD!! $(OPENTTD_ARGS) |
98 |
101 |
99 %.o: |
102 %.o: |
100 @for dir in $(SRC_DIRS); do \ |
103 @for dir in $(SRC_DIRS); do \ |
101 $(MAKE) -C $$dir $(@:src/%=%); \ |
104 $(MAKE) -C $$dir $(@:src/%=%); \ |
102 done |
105 done |
131 BUNDLE_NAME = OTTD-$(OS)-custom-$(REV) |
134 BUNDLE_NAME = OTTD-$(OS)-custom-$(REV) |
132 endif |
135 endif |
133 |
136 |
134 # An OSX application bundle needs the data files, lang files and openttd executable in a different location. |
137 # An OSX application bundle needs the data files, lang files and openttd executable in a different location. |
135 ifdef OSXAPP |
138 ifdef OSXAPP |
136 DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Data |
139 DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data |
137 LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Lang |
140 LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang |
138 TTD_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS |
141 TTD_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS |
139 else |
142 else |
140 DATA_DIR = $(BUNDLE_DIR)/data |
143 DATA_DIR = $(BUNDLE_DIR)/data |
141 LANG_DIR = $(BUNDLE_DIR)/lang |
144 LANG_DIR = $(BUNDLE_DIR)/lang |
142 TTD_DIR = $(BUNDLE_DIR) |
145 TTD_DIR = $(BUNDLE_DIR) |