firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 02:03:04 +01:00
Code Issues

Improve Win32 build. Add resources to superserver

Browse Source
This commit is contained in:
aafemt 2003-03-31 10:29:16 +00:00
parent 632a774248
commit 0c8daeb80d
4 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builds/posix/Makefile.in.client.util
View File

@ -27,7 +27,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.client.util,v 1.8 2003-03-27 11:21:43 aafemt Exp $ # $Id: Makefile.in.client.util,v 1.9 2003-03-31 10:29:14 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=client.util ObjModuleName=client.util
@ -111,9 +111,9 @@ $(CREATE_DB): $(CREATEDB_Objects)
gstat : $(GSTAT) gstat : $(LIBFBCLIENT_SO) $(GSTAT)
$(GSTAT): $(GSTAT_Objects) $(LIBFBCLIENT_SO) $(GSTAT): $(GSTAT_Objects)
$(LD) $(LINK_OPTS) $(GSTAT_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) $(LD) $(LINK_OPTS) $(GSTAT_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
@ -130,19 +130,19 @@ $(GDS_RELAY): $(RELAY_Objects) $(LIBFBCLIENT_SO)
$(LD) $(LINK_OPTS) $(RELAY_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) $(LD) $(LINK_OPTS) $(RELAY_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
gsec: $(GSEC) gsec: $(LIBFBCLIENT_SO) $(GSEC)
$(GSEC): $(GSEC_Objects) $(LIBFBCLIENT_SO) $(GSEC): $(GSEC_Objects)
$(LD) $(LINK_OPTS) $(GSEC_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) $(LD) $(LINK_OPTS) $(GSEC_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
fbguard: $(FBGUARD) fbguard: $(LIBFBCLIENT_SO) $(FBGUARD)
$(FBGUARD): $(FBGUARD_Objects) $(LIBFBCLIENT_SO) $(FBGUARD): $(FBGUARD_Objects)
$(LD) $(LINK_OPTS) $(FBGUARD_Objects) -o $@ -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS) $(LD) $(LINK_OPTS) $(FBGUARD_Objects) -o $@ -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS)
ibguard: $(IBGUARD) ibguard: $(LIBFBCLIENT_SO) $(IBGUARD)
$(IBGUARD): $(IBGUARD_A_Objects) $(IBGUARD_B_Objects) $(LIBFBCLIENT_SO) $(IBGUARD): $(IBGUARD_A_Objects) $(IBGUARD_B_Objects)
$(LD) $(LINK_OPTS) $(IBGUARD_A_Objects) $(IBGUARD_B_Objects) -o $@ -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS) $(LD) $(LINK_OPTS) $(IBGUARD_A_Objects) $(IBGUARD_B_Objects) -o $@ -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS)
fbmgr_bin: $(FBMGR_BIN) fbmgr_bin: $(FBMGR_BIN)

6
builds/posix/Makefile.in.fbserver
View File

@ -27,7 +27,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.fbserver,v 1.9 2003-03-28 11:29:18 aafemt Exp $ # $Id: Makefile.in.fbserver,v 1.10 2003-03-31 10:29:15 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=fbserver ObjModuleName=fbserver
@ -59,8 +59,8 @@ Dependencies = $(AllObjects:.o=.d)
fbserver : $(FB_SUPER_SERVER) fbserver : $(FB_SUPER_SERVER)
$(FB_SUPER_SERVER): $(SERVER_Objects) $(IPSERVER_Objects) $(LIBFBSERVER_A) $(FB_SUPER_SERVER): $(SERVER_Objects) $(IPSERVER_Objects) -lfbserver
$(LD) $(LINK_OPTS) $(SERVER_Objects) $(IPSERVER_Objects) -o $@ -L $(LIB) -lfbserver $(LIB_GUI) $(LINK_LIBS) $(LD) $(LINK_OPTS) $^ -o $@ $(LIB_GUI) $(LINK_LIBS)
# $(CHMOD_S7) $@ # $(CHMOD_S7) $@
#$(LIB)/libalice.a \ #$(LIB)/libalice.a \

18
builds/posix/Makefile.in.libfbclient
View File

@ -27,7 +27,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.libfbclient,v 1.13 2003-03-27 11:21:45 aafemt Exp $ # $Id: Makefile.in.libfbclient,v 1.14 2003-03-31 10:29:15 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=libfbclient ObjModuleName=libfbclient
@ -105,16 +105,20 @@ FBCLIENT_Objects = $(JRD_ClientObjects) \
libfbclient : $(LIBFBCLIENT_SONAME) libfbclient : $(LIBFBCLIENT_SONAME)
ifneq ($(ClientLibraryNameFull),$(ClientLibraryNameMajor))
$(LIBFBCLIENT_SOBASENAME): $(LIBFBCLIENT_SO)
(cd $(LIB) && $(LN) -f $(ClientLibraryNameFull) $(ClientLibraryNameMajor) )
endif
ifneq ($(ClientLibraryName),$(ClientLibraryNameMajor))
$(LIBFBCLIENT_SONAME): $(LIBFBCLIENT_SOBASENAME)
(cd $(LIB) && $(LN) -f $(ClientLibraryNameMajor) $(ClientLibraryName) )
endif
$(LIBFBCLIENT_SO): $(FBCLIENT_Objects) $(LIBFBCLIENT_SO): $(FBCLIENT_Objects)
# $(LIB_LINK) -Wl,-soname,libfbclient.$(SHRLIB_EXT).1 -Wl,-rpath,/usr/lib -o $@ $^ # $(LIB_LINK) -Wl,-soname,libfbclient.$(SHRLIB_EXT).1 -Wl,-rpath,/usr/lib -o $@ $^
$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(ClientLibraryNameMajor) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ $(SO_LINK_LIBS) $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(ClientLibraryNameMajor) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ $(SO_LINK_LIBS)
$(LIBFBCLIENT_SOBASENAME): $(LIBFBCLIENT_SO)
(cd $(LIB) && $(LN) -f $(ClientLibraryNameFull) $(ClientLibraryNameMajor) )
$(LIBFBCLIENT_SONAME): $(LIBFBCLIENT_SOBASENAME)
(cd $(LIB) && $(LN) -f $(ClientLibraryNameMajor) $(ClientLibraryName) )
AllObjects = $(FBCLIENT_Objects) AllObjects = $(FBCLIENT_Objects)
Dependencies = $(AllObjects:.o=.d) Dependencies = $(AllObjects:.o=.d)

14
builds/posix/prefix.mingw
View File

@ -16,8 +16,8 @@
# Contributor(s): ______________________________________. # Contributor(s): ______________________________________.
# Start of file prefix.win32: $(VERSION) $(PLATFORM) # Start of file prefix.win32: $(VERSION) $(PLATFORM)
PROD_FLAGS=-O2 -march=@CPU_TYPE@ -mcpu=@CPU_TYPE@ -mno-cygwin -fcheck-new -Wall -Wno-unknown-pragmas -Wno-parentheses -Wno-switch -fmessage-length=0 -D__SEH_NOOP -DIPSERVER -DMAXPATHLEN=255 -DMINGW -DWIN32_LEAN_AND_MEAN -MMD PROD_FLAGS=-O2 -march=@CPU_TYPE@ -mcpu=@CPU_TYPE@ -mno-cygwin -fcheck-new -Wall -Wno-unknown-pragmas -Wno-parentheses -Wno-switch -fmessage-length=0 -D__SEH_NOOP -DIPSERVER -DMAXPATHLEN=255 -DWIN32_LEAN_AND_MEAN -MMD
DEV_FLAGS=-ggdb -march=@CPU_TYPE@ -mcpu=@CPU_TYPE@ -mno-cygwin -fcheck-new -Wall -Wno-unknown-pragmas -Wno-parentheses -Wno-switch -fmessage-length=0 -D__SEH_NOOP -DIPSERVER -DMAXPATHLEN=255 -DMINGW -DDEBUG_GDS_ALLOC -DWIN32_LEAN_AND_MEAN -MMD DEV_FLAGS=-ggdb -march=@CPU_TYPE@ -mcpu=@CPU_TYPE@ -mno-cygwin -fcheck-new -Wall -Wno-unknown-pragmas -Wno-parentheses -Wno-switch -fmessage-length=0 -D__SEH_NOOP -DIPSERVER -DMAXPATHLEN=255 -DDEBUG_GDS_ALLOC -DWIN32_LEAN_AND_MEAN -MMD
PLATFORM_PATH=jrd/os/win32 PLATFORM_PATH=jrd/os/win32
@ -27,7 +27,7 @@ OS_SPECIFIC_Files=thd_priority.cpp
OS_ServerFiles=srvr_w32 window.cpp chop.cpp property.cpp ibconfig.cpp cntl.cpp OS_ServerFiles=srvr_w32 window.cpp chop.cpp property.cpp ibconfig.cpp cntl.cpp
LIB_LINK_OPTIONS:=-shared LIB_LINK_OPTIONS:=-shared -Wl,--add-stdcall-alias
LIB_LINK_RPATH:=-Wl,-rpath, LIB_LINK_RPATH:=-Wl,-rpath,
LIB_LINK_SONAME:=-Wl,-soname, LIB_LINK_SONAME:=-Wl,-soname,
LIB_GUI:= -mwindows -lcomctl32 -lgdi32 LIB_GUI:= -mwindows -lcomctl32 -lgdi32
@ -43,3 +43,11 @@ FilesToAddVersionInfo=$(LIBFBEMBED_SO) $(LIBFBCLIENT_SO) $(LIBFBINTL_SO) \
$(GSTAT) $(GSEC) $(GFIX) $(QLI) $(ISQL) $(GBAK) $(GPRE) $(GSTAT) $(GSEC) $(GFIX) $(QLI) $(ISQL) $(GBAK) $(GPRE)
# TODO: guardians also must be here # TODO: guardians also must be here
FilesToAddDialog=$(FB_SUPER_SERVER) $(FB_CLASSIC_SERVER) FilesToAddDialog=$(FB_SUPER_SERVER) $(FB_CLASSIC_SERVER)
# Override library names to suppress 'lib'-prefix
LIBFBINTL_SO := $(patsubst %libfbintl.dll,%fbintl.dll,$(LIBFBINTL_SO))
ClientLibraryName := $(patsubst lib%,%,$(ClientLibraryName))
# Override library names to suppress version suffix
ClientLibraryNameFull := $(ClientLibraryName)
ClientLibraryNameMajor := $(ClientLibraryName)