mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-02-02 10:40:38 +01:00
Use linker to link DLLs on MinGW
This commit is contained in:
parent
4c4acdcc1b
commit
97e3f9ad42
@ -115,6 +115,42 @@ LN= @LN_S@
|
||||
RANLIB= @RANLIB@
|
||||
BTYACC=$(ROOT)/extern/btyacc/btyacc
|
||||
|
||||
CC = @CC@
|
||||
CXX = @CXX@
|
||||
LD = @CXX@
|
||||
|
||||
#
|
||||
# LIBTOOL ISSUES
|
||||
#
|
||||
# Most of the libraries and programs are linked using the dynamic linker
|
||||
# We default to using the dynamic linker and have a special link macros for
|
||||
# using the static linker.
|
||||
#
|
||||
# Also libtool looks like the future in cross platform shared object compile
|
||||
# and linking, but unfortunately it does not yet work for us, as a
|
||||
# libtool gcc -o $(BIN)/fred fred.o libzzz.la
|
||||
# command will generate incorrect relative addresses in the wrapper script in
|
||||
# $(BIN)/fred as it required the exe file fred to be in the directory from
|
||||
# which the command is run from.
|
||||
# One other issue is that libtool puts a -DPIC onto the compile line. While
|
||||
# nice it conflicts with a struct in the file qli/format.h
|
||||
# MOD 26-July-2001.
|
||||
|
||||
# LINKER COMMANDS
|
||||
# they are candidates to go to make.defaults and make this file make.defaults.in
|
||||
# if we decide to support different linkers directly in our build process.
|
||||
# Alternatively we may use libtool here.
|
||||
|
||||
LIB_LINK= @CC@
|
||||
STATICLIB_LINK= ar cruvs
|
||||
EXE_LINK = @CXX@
|
||||
STATICEXE_LINK = @CXX@
|
||||
|
||||
LINK_LIBS = @LIBS@ @EDITLINE_A@
|
||||
ICU_LIBS = -licuuc -licudata -licui18n
|
||||
STATICLINK_LIBS = @LIBS@ @EDITLINE_A@
|
||||
SO_LINK_LIBS = @LIBS@
|
||||
|
||||
# Default extensions
|
||||
|
||||
ARCH_EXT= .a
|
||||
|
@ -26,7 +26,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: make.rules,v 1.28 2005-12-28 06:58:28 aafemt Exp $
|
||||
# $Id: make.rules,v 1.29 2006-07-04 04:05:06 aafemt Exp $
|
||||
#
|
||||
|
||||
#____________________________________________________________________________
|
||||
@ -43,42 +43,6 @@ endif
|
||||
|
||||
CXXFLAGS:= $(CXXFLAGS) $(CFLAGS)
|
||||
|
||||
CC = @CC@
|
||||
CXX = @CXX@
|
||||
LD = @CXX@
|
||||
|
||||
#
|
||||
# LIBTOOL ISSUES
|
||||
#
|
||||
# Most of the libraries and programs are linked using the dynamic linker
|
||||
# We default to using the dynamic linker and have a special link macros for
|
||||
# using the static linker.
|
||||
#
|
||||
# Also libtool looks like the future in cross platform shared object compile
|
||||
# and linking, but unfortunately it does not yet work for us, as a
|
||||
# libtool gcc -o $(BIN)/fred fred.o libzzz.la
|
||||
# command will generate incorrect relative addresses in the wrapper script in
|
||||
# $(BIN)/fred as it required the exe file fred to be in the directory from
|
||||
# which the command is run from.
|
||||
# One other issue is that libtool puts a -DPIC onto the compile line. While
|
||||
# nice it conflicts with a struct in the file qli/format.h
|
||||
# MOD 26-July-2001.
|
||||
|
||||
# LINKER COMMANDS
|
||||
# they are candidates to go to make.defaults and make this file make.defaults.in
|
||||
# if we decide to support different linkers directly in our build process.
|
||||
# Alternatively we may use libtool here.
|
||||
|
||||
LIB_LINK= @CC@
|
||||
STATICLIB_LINK= ar cruvs
|
||||
EXE_LINK = @CXX@
|
||||
STATICEXE_LINK = @CXX@
|
||||
|
||||
LINK_LIBS = @LIBS@ @EDITLINE_A@
|
||||
ICU_LIBS = -licuuc -licudata -licui18n
|
||||
STATICLINK_LIBS = @LIBS@ @EDITLINE_A@
|
||||
SO_LINK_LIBS = @LIBS@
|
||||
|
||||
# Here we have definitions for using the preprocessor.
|
||||
|
||||
# The GPRE_FLAGS is overwritten in Makefile.in.jrd Makefile.in.gpre and
|
||||
|
@ -31,6 +31,9 @@ OS_SPECIFIC_Files=thd_priority.cpp
|
||||
|
||||
OS_ServerFiles= os/win32/srvr_w32 os/win32/window.cpp os/win32/chop.cpp os/win32/property.cpp os/win32/ibconfig.cpp os/win32/cntl.cpp
|
||||
|
||||
# Override link command for implicit stdc++ linking
|
||||
LIB_LINK=$(LD)
|
||||
|
||||
LIB_LINK_OPTIONS+=-Wl,--enable-stdcall-fixup
|
||||
|
||||
# Strip symbols from release versions to decrease size
|
||||
@ -43,7 +46,7 @@ LIB_LINK_IMPLIB:=-Wl,--out-implib,firebird/lib/fbclient_ms.lib
|
||||
LIB_GUI:= -mwindows -lcomctl32 -lgdi32
|
||||
|
||||
EMBED_UTIL_TARGETS:=gstat gsec nbackup fb_lock_print
|
||||
CLIENT_UTIL_TARGETS:=gstat gsec ibguard instsvc instreg nbackup fb_lock_print
|
||||
CLIENT_UTIL_TARGETS:=gstat gsec instsvc instreg nbackup fb_lock_print
|
||||
|
||||
Physical_IO_Module=os/win32/winnt.cpp
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user