| From 3ef250d8ffa5a949012c71518cc1201f7d84d606 Mon Sep 17 00:00:00 2001 |
| From: Alexpux <alexey.pawlow@gmail.com> |
| Date: Sat, 22 Nov 2014 12:03:41 +0300 |
| Subject: [PATCH 14/27] Move extra mingw sources definitions for fbintl to |
| Makefile.in.intl |
| |
| --- |
| builds/posix/Makefile.in.intl | 9 ++++++++- |
| 1 file changed, 8 insertions(+), 1 deletion(-) |
| |
| diff --git a/builds/posix/Makefile.in.intl b/builds/posix/Makefile.in.intl |
| index 1bd37d02f2..d5a2c8bebc 100644 |
| --- a/builds/posix/Makefile.in.intl |
| +++ b/builds/posix/Makefile.in.intl |
| @@ -52,6 +52,13 @@ INTL_Files1= ld.cpp cv_narrow.cpp \ |
| cs_ksc.cpp cv_ksc.cpp lc_ksc.cpp \ |
| cs_icu.cpp cv_icu.cpp lc_icu.cpp |
| |
| +ifeq ($(PLATFORM),win32) |
| +INTL_Files2 += $(FBCONFIG_Sources) \ |
| + $(FBCLASSES_MsgSources) \ |
| + $(OS_SPECIFIC_Sources) \ |
| + jrd/isc.cpp jrd/gds.cpp \ |
| + common/utils.cpp |
| +endif |
| # use INTL_Files2 in prefix file for host-specific additional files |
| INTL_Sources= $(addprefix intl/, $(INTL_Files1)) $(INTL_Files2) \ |
| jrd/IntlUtil.cpp jrd/unicode_util.cpp jrd/CharSet.cpp jrd/mod_loader.cpp jrd/path_utils.cpp |
| @@ -61,7 +68,7 @@ INTL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(INTL_Sources))) |
| # SD: Shared variables are overriden to exclude extra files and |
| # this way fix 'unresolved symbol' errors when some unused routines call |
| # other routines from not included modules |
| -FBCLASSES_ClientFiles=alloc.cpp locks.cpp fb_string.cpp timestamp.cpp |
| +FBCLASSES_ClientFiles=alloc.cpp locks.cpp fb_string.cpp timestamp.cpp TempFile.cpp |
| |
| |
| AllObjects = $(INTL_Objects) |
| -- |
| 2.13.0 |
| |
