| From ca51dedfbfc1489aafcb638b5f4ae45cefb5fbf3 Mon Sep 17 00:00:00 2001 |
| From: Alexpux <alexey.pawlow@gmail.com> |
| Date: Sun, 23 Nov 2014 13:27:02 +0300 |
| Subject: [PATCH 17/27] Fix building net_server and mp_server with mingw |
| |
| --- |
| builds/posix/Makefile.in.inet_server | 4 ++-- |
| builds/posix/Makefile.in.smp_server | 4 ++-- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/builds/posix/Makefile.in.inet_server b/builds/posix/Makefile.in.inet_server |
| index ad471fda12..99ddd19753 100644 |
| --- a/builds/posix/Makefile.in.inet_server |
| +++ b/builds/posix/Makefile.in.inet_server |
| @@ -54,8 +54,8 @@ Dependencies = $(AllObjects:.o=.d) |
| # but we must ensure it's existance |
| fb_inet_server : $(LIBFBEMBED_SO) $(FB_CLASSIC_SERVER) |
| |
| -$(FB_CLASSIC_SERVER): $(SERVER_Objects) |
| - $(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LIB_GUI) $(LINK_LIBS) |
| +$(FB_CLASSIC_SERVER): $(SERVER_Objects) $(COMMON_Objects) $(CLUMPLETS_Objects) $(FBCONFIG_Objects) $(OS_SPECIFIC_Objects) $(DSQL_Objects) $(BURP_Objects) $(ALICE_Objects) $(LOCK_Objects) $(INTERFACE_Objects) $(NBACKUP_SERVER_Objects) $(NTRACE_SERVER_Objects) $(SECURITY_Objects) $(JRD_Objects) |
| + $(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LIB_GUI) $(ICU_LIBS) $(LINK_LIBS) |
| |
| include $(ROOT)/gen/make.shared.targets |
| |
| diff --git a/builds/posix/Makefile.in.smp_server b/builds/posix/Makefile.in.smp_server |
| index 1bc387230e..f3860213ef 100644 |
| --- a/builds/posix/Makefile.in.smp_server |
| +++ b/builds/posix/Makefile.in.smp_server |
| @@ -59,8 +59,8 @@ $(OS_SPECIFIC_Objects) |
| |
| fb_smp_server: $(FB_DAEMON) |
| |
| -$(FB_DAEMON): $(SERVER_Objects) |
| - $(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS) |
| +$(FB_DAEMON): $(SERVER_Objects) $(DSQL_Objects) $(BURP_Objects) $(ALICE_Objects) $(JRD_Objects) $(LOCK_Objects) $(INTERFACE_Objects) $(SECURITY_Objects) $(NBACKUP_SERVER_Objects) $(NTRACE_SERVER_Objects) |
| + $(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LIB_GUI) $(LINK_LIBS) $(ICU_LIBS) |
| |
| AllObjects = $(SERVER_Objects) |
| |
| -- |
| 2.13.0 |
| |
