mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 21:23:04 +01:00
Little step towards MinGW build. Physical IO module is platform-depended now
This commit is contained in:
aafemt
parent
8b7e619d09
commit
e55e271385
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.boot.gpre,v 1.12 2002-12-16 21:19:16 skidder Exp $
|
||||
# $Id: Makefile.in.boot.gpre,v 1.13 2003-02-11 05:13:36 aafemt Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleName=boot.gpre
|
||||
@ -72,7 +72,7 @@ gpre_boot : $(GPRE_BOOT)
|
||||
$(GPRE_BOOT): $(GPREBOOT_Objects) $(LIB)/libfbcommon.a
|
||||
$(LD) $(LINK_OPTS) $(GPREBOOT_Objects) -o $@ -L $(LIB) -lfbcommon $(LINK_LIBS)
|
||||
-$(RM) $(GPRE_CURRENT)
|
||||
$(LN) $(@F) $(GPRE_CURRENT)
|
||||
(cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT)))
|
||||
|
||||
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.static.gpre,v 1.8 2002-12-02 11:17:02 eku Exp $
|
||||
# $Id: Makefile.in.static.gpre,v 1.9 2003-02-11 05:13:36 aafemt Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleName=static.gpre
|
||||
@ -64,7 +64,7 @@ gpre_static : $(GPRE_STATIC)
|
||||
$(GPRE_STATIC): $(GPRESTATIC_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
|
||||
$(LD) $(LINK_OPTS) $(GPRESTATIC_Objects) -o $@ -L $(LIB) -lfbstatic -lfbcommon $(LINK_LIBS)
|
||||
-$(RM) $(GPRE_CURRENT)
|
||||
$(LN) $(@F) $(GPRE_CURRENT)
|
||||
(cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT)))
|
||||
|
||||
|
||||
include $(ROOT)/gen/make.shared.targets
|
||||
|
||||
@ -41,7 +41,7 @@ JRD_ServerFiles= blob_filter.epp dpm.epp dyn.epp dyn_def.epp \
|
||||
rng.cpp rse.cpp sbm.cpp \
|
||||
sdw.cpp shut.cpp sort.cpp sort_mem.cpp sqz.cpp \
|
||||
svc.cpp sym.cpp tpc.cpp tra.cpp val.cpp vio.cpp \
|
||||
unix.cpp nodebug.cpp
|
||||
nodebug.cpp $(Physical_IO_Module)
|
||||
|
||||
|
||||
JRD_Files = $(JRD_ClientFiles) $(JRD_ServerFiles)
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
# All Rights Reserved.
|
||||
# Contributor(s): ______________________________________.
|
||||
# Start of file prefix.darwin: $(VERSION) @PLATFORM@
|
||||
#$Id: prefix.darwin,v 1.6 2002-12-29 01:38:20 nmcc Exp $
|
||||
#$Id: prefix.darwin,v 1.7 2003-02-11 05:13:36 aafemt Exp $
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
|
||||
|
||||
PROD_FLAGS=-O3 -DNDEBUG -DDARWIN -pipe -MMD -p -fPIC
|
||||
@ -23,3 +23,5 @@ DEV_FLAGS=-ggdb -DDARWIN -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall
|
||||
LIB_LINK_OPTIONS:=-shared
|
||||
LIB_LINK_RPATH:=-Wl,-rpath,
|
||||
LIB_LINK_SONAME:=-Wl,-soname,
|
||||
|
||||
Physical_IO_Module=unix.cpp
|
||||
|
||||
@ -11,3 +11,4 @@ LIB_LINK_OPTIONS:=
|
||||
LIB_LINK_RPATH:=-Wl,-rpath,
|
||||
LIB_LINK_SONAME:=-Wl,-soname,
|
||||
|
||||
Physical_IO_Module=unix.cpp
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
# All Rights Reserved.
|
||||
# Contributor(s): ______________________________________.
|
||||
# Start of file prefix.freebsd: $(VERSION) @PLATFORM@
|
||||
#$Id: prefix.freebsd,v 1.4 2002-12-29 01:38:20 nmcc Exp $
|
||||
#$Id: prefix.freebsd,v 1.5 2003-02-11 05:13:36 aafemt Exp $
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
|
||||
|
||||
PROD_FLAGS=-O -DNDEBUG -DFREEBSD -pipe -MMD -p -fPIC
|
||||
@ -23,3 +23,5 @@ DEV_FLAGS=-ggdb -DFREEBSD -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall
|
||||
LIB_LINK_OPTIONS:=-shared
|
||||
LIB_LINK_RPATH:=-Wl,-rpath,
|
||||
LIB_LINK_SONAME:=-Wl,-soname,
|
||||
|
||||
Physical_IO_Module=unix.cpp
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
# All Rights Reserved.
|
||||
# Contributor(s): ______________________________________.
|
||||
# Start of file prefix.linux: $(VERSION) $(PLATFORM)
|
||||
#$Id: prefix.linux,v 1.13 2002-12-29 01:38:20 nmcc Exp $
|
||||
#$Id: prefix.linux,v 1.14 2003-02-11 05:13:36 aafemt Exp $
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
|
||||
|
||||
# The foillowing has been commented out since gcc 3.2 has some problems
|
||||
@ -27,3 +27,5 @@ DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
|
||||
LIB_LINK_OPTIONS:=-shared
|
||||
LIB_LINK_RPATH:=-Wl,-rpath,
|
||||
LIB_LINK_SONAME:=-Wl,-soname,
|
||||
|
||||
Physical_IO_Module=unix.cpp
|
||||
|
||||
@ -26,3 +26,5 @@ JRDBOOT_Extra_Files=isc_sync.cpp thd.cpp
|
||||
LIB_LINK_OPTIONS:=-shared
|
||||
LIB_LINK_RPATH:=-Wl,-rpath,
|
||||
LIB_LINK_SONAME:=-Wl,-soname,
|
||||
|
||||
Physical_IO_Module=winnt.cpp
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
#
|
||||
# Erik Kunze, Philosys GmbH, <kunze@philosys.de>
|
||||
#
|
||||
# $Id: prefix.sinixz,v 1.14 2003-02-10 13:28:04 eku Exp $
|
||||
# $Id: prefix.sinixz,v 1.15 2003-02-11 05:13:36 aafemt Exp $
|
||||
#
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
|
||||
|
||||
@ -38,4 +38,6 @@ LIB_LINK_OPTIONS:=-shared
|
||||
LIB_LINK_RPATH:=-Wl,-rpath,
|
||||
LIB_LINK_SONAME:=-Wl,-soname,
|
||||
|
||||
Physical_IO_Module=unix.cpp
|
||||
|
||||
# EOF
|
||||
|
||||
@ -56,3 +56,4 @@ LIB_LINK_OPTIONS:= -G
|
||||
LIB_LINK_RPATH:=-R
|
||||
LIB_LINK_SONAME:=-h
|
||||
|
||||
Physical_IO_Module=unix.cpp
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#
|
||||
# Use SOLX86 to identify x86 version of Solaris. Neil McCalden
|
||||
#
|
||||
# $Id: prefix.solx86,v 1.14 2002-12-07 13:50:29 kkuznetsov Exp $
|
||||
# $Id: prefix.solx86,v 1.15 2003-02-11 05:13:36 aafemt Exp $
|
||||
#
|
||||
# Start of file prefix.solaris X 86 : $(VERSION) $(PLATFORM)
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
|
||||
@ -53,3 +53,5 @@ LIB_LINK_OPTIONS:= -G
|
||||
LIB_LINK_RPATH:=-R
|
||||
LIB_LINK_SONAME:=-h
|
||||
#LINK_OPTS:= $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/intl
|
||||
|
||||
Physical_IO_Module=unix.cpp
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
dnl $Id: configure.in,v 1.113 2003-02-10 15:59:01 skidder Exp $
|
||||
dnl $Id: configure.in,v 1.114 2003-02-11 05:13:34 aafemt Exp $
|
||||
|
||||
dnl ############################# INITIALISATION ###############################
|
||||
|
||||
@ -557,6 +557,7 @@ mkdir -p gen/libfbserver/fbutil
|
||||
mkdir -p gen/libfbserver/wal
|
||||
mkdir -p gen/libfbserver/common/classes
|
||||
mkdir -p gen/libfbserver/jrd/os/posix
|
||||
mkdir -p gen/libfbserver/jrd/os/win32
|
||||
mkdir -p gen/fbserver/remote
|
||||
mkdir -p gen/libfbclient/jrd
|
||||
mkdir -p gen/libfbclient/dsql
|
||||
@ -578,6 +579,7 @@ mkdir -p gen/libfbcommon/common/classes
|
||||
mkdir -p gen/libfbcommon/common/config
|
||||
mkdir -p gen/libfbcommon/fbutil
|
||||
mkdir -p gen/boot.gpre/jrd/os/posix
|
||||
mkdir -p gen/boot.gpre/jrd/os/win32
|
||||
mkdir -p gen/boot.gpre/gpre
|
||||
mkdir -p gen/static.gpre
|
||||
mkdir -p gen/static.gpre/jrd
|
||||
@ -590,6 +592,7 @@ mkdir -p gen/static.gpre/alice
|
||||
mkdir -p gen/static.gpre/utilities
|
||||
mkdir -p gen/static.gpre/fbutil
|
||||
mkdir -p gen/static.gpre/jrd/os/posix
|
||||
mkdir -p gen/static.gpre/jrd/os/win32
|
||||
mkdir -p gen/static.gpre/burp
|
||||
mkdir -p gen/static.gpre/wal
|
||||
mkdir -p gen/static.gbak/burp
|
||||
@ -606,6 +609,7 @@ mkdir -p gen/libfbstatic/alice
|
||||
mkdir -p gen/libfbstatic/utilities
|
||||
mkdir -p gen/libfbstatic/fbutil
|
||||
mkdir -p gen/libfbstatic/jrd/os/posix
|
||||
mkdir -p gen/libfbstatic/jrd/os/win32
|
||||
mkdir -p gen/libfbstatic/burp
|
||||
mkdir -p gen/libfbstatic/wal
|
||||
mkdir -p gen/libfbstatic/common
|
||||
@ -634,6 +638,7 @@ mkdir -p gen/libfbembed/alice
|
||||
mkdir -p gen/libfbembed/utilities
|
||||
mkdir -p gen/libfbembed/fbutil
|
||||
mkdir -p gen/libfbembed/jrd/os/posix
|
||||
mkdir -p gen/libfbembed/jrd/os/win32
|
||||
mkdir -p gen/libfbembed/burp
|
||||
mkdir -p gen/libfbembed/wal
|
||||
mkdir -p gen/libfbembed/common/classes
|
||||
|
||||
Loading…
Reference in New Issue
Block a user