8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 21:23:03 +01:00

Paul's changes from CVS - Mac port

This commit is contained in:
alexpeshkoff 2010-06-09 08:37:25 +00:00
parent ef56abd46e
commit 732986946c
4 changed files with 17 additions and 19 deletions

View File

@ -82,7 +82,6 @@ darwin_finish_cs_framework:
cp ../gen/firebird/bin/gdef $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/qli $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/nbackup $(FB_FW)/Resources/bin
@ -149,7 +148,6 @@ darwin_finish_ss_framework:
cp ../gen/firebird/bin/isql $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gpre $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/fb_lock_print $(FB_FW)/Resources/bin
#cp ../gen/firebird/bin/gds_drop $(FB_FW)/Resources/bin
#cp ../gen/firebird/bin/gds_relay $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gsec $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/gstat $(FB_FW)/Resources/bin

View File

@ -22,27 +22,27 @@
# 2. dnl the CPU_TYPE
# 3. edit extern/icu/source/config and set the right 32bit flags (-arch i386)
# 4. for CFLAGS, CXXFLAGS. LDFLAGS export '-m32 -arch i386'
# 5. export MACOSX_DEPLOYMENT_TARGET=10.4
# 5. export MACOSX_DEPLOYMENT_TARGET=10.6
DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
export DYLD_LIBRARY_PATH
MACOSX_DEPLOYMENT_TARGET=10.4
MACOSX_DEPLOYMENT_TARGET=10.6
export MACOSX_DEPLOYMENT_TARGET
OS_ServerFiles=inet_server.cpp
PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.4
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.4
PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.6
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.6
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
fbtracemgr
Physical_IO_Module=os/posix/unix.cpp
PLATFORM_PATH=os/darwin
LINK_OPTS:=-m32
LD_FLAGS+=-m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
LD_FLAGS+=-m32 -arch i386
include $(ROOT)/gen/darwin.defaults

View File

@ -22,16 +22,16 @@
DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
export DYLD_LIBRARY_PATH
MACOSX_DEPLOYMENT_TARGET=10.5
MACOSX_DEPLOYMENT_TARGET=10.6
export MACOSX_DEPLOYMENT_TARGET
OS_ServerFiles=inet_server.cpp
PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.5
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.5
PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.6
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
EMBED_UTIL_TARGETS=gstat gds_drop gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
fbtracemgr
Physical_IO_Module=os/posix/unix.cpp

View File

@ -17,9 +17,9 @@ LD_FLAGS += -headerpad_max_install_names -arch x86_64
# Set CFLAGS and CXXFLAGS for relevant MacOS architecture
# and backwards compatibility. Set accordingly before building.
# Default 64 bit Leopard/Snow Leopard - intel (MacOS 10.5+)
CFLAGS += -arch x86_64
CXXFLAGS += -arch x86_64
# Default 64 bit Snow Leopard - intel (MacOS 10.6+)
CFLAGS += -arch x86_64 -mmacosx-version-min=10.6
CXXFLAGS += -arch x86_64 -mmacosx-version-min=10.6
# 64 bit powerpc
#CFLAGS += -arch ppc64 -mmacosx-version-min=10.5
@ -27,8 +27,8 @@ CXXFLAGS += -arch x86_64
# 32bit intel default
# DARWIN flag added because of problem with putil.c
#CFLAGS += -arch i386 -mmacosx-version-min=10.4 -DDARWIN
#CXXFLAGS += -arch i386 -mmacosx-version-min=10.4
#CFLAGS += -arch i386 -mmacosx-version-min=10.6 -DDARWIN
#CXXFLAGS += -arch i386 -mmacosx-version-min=10.6
# 32 bit powerpc
#CFLAGS += -arch ppc -mmacosx-version-min=10.2