dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: include win32/win64 in output bundle name for mingw target.

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-11-17 18:56:57 +00:00
parent 4608ed79bb
commit 73367d7209
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.bundle.in
View File

@@ -21,6 +21,9 @@ endif
ifndef BUNDLE_NAME ifndef BUNDLE_NAME
BUNDLE_NAME = openttd-custom-$(REV)-$(OS) BUNDLE_NAME = openttd-custom-$(REV)-$(OS)
ifeq ($(OS),MINGW)
BUNDLE_NAME := $(BUNDLE_NAME)-win$(CPU_TYPE)
endif
endif endif
# An OSX application bundle needs the data files, lang files and openttd executable in a different location. # An OSX application bundle needs the data files, lang files and openttd executable in a different location.

1
Makefile.in
View File

@@ -39,6 +39,7 @@ STRIP = !!STRIP!!
TTD = !!TTD!! TTD = !!TTD!!
TTDS = $(SRC_DIRS:%=%/$(TTD)) TTDS = $(SRC_DIRS:%=%/$(TTD))
OS = !!OS!! OS = !!OS!!
CPU_TYPE = !!CPU_TYPE!!
OSXAPP = !!OSXAPP!! OSXAPP = !!OSXAPP!!
LIPO = !!LIPO!! LIPO = !!LIPO!!
AWK = !!AWK!! AWK = !!AWK!!

1
config.lib
View File

@@ -3362,6 +3362,7 @@ make_sed() {
s@!!OBJS_RC!!@$OBJS_RC@g; s@!!OBJS_RC!!@$OBJS_RC@g;
s@!!SRCS!!@$SRCS@g; s@!!SRCS!!@$SRCS@g;
s@!!OS!!@$os@g; s@!!OS!!@$os@g;
s@!!CPU_TYPE!!@$cpu_type@g;
s@!!CONFIGURE_FILES!!@$CONFIGURE_FILES@g; s@!!CONFIGURE_FILES!!@$CONFIGURE_FILES@g;
s@!!AWK!!@$awk@g; s@!!AWK!!@$awk@g;
s@!!DISTCC!!@$distcc@g; s@!!DISTCC!!@$distcc@g;