Add mingw support

Add support for MinGW
FirebirdSQL · Nov 19, 2024 · c9346b7 · c9346b7
1 parent 377d035
commit c9346b7
Show file tree

Hide file tree

Showing 12 changed files with 211 additions and 64 deletions.
diff --git a/acx_pthread.m4 b/acx_pthread.m4
@@ -74,6 +74,9 @@ case "${host_cpu}-${host_os}" in
 
         acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
         ;;
+        *mingw*)
+        acx_pthread_flags="none"
+        ;;
 esac
 
 if test x"$acx_pthread_ok" = xno; then

diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in
@@ -256,7 +256,11 @@ endif
 %.vers: $(ROOT)/builds/posix/%.vers
 	sh vers.sh $(firstword $@)
 
+ifeq ($(PLATFORM),win32)
+export_lists:
+else
 export_lists: $(ALLVERS)
+endif
 
 #___________________________________________________________________________
 # LibTomMath - used by cross-builds
@@ -315,7 +319,7 @@ $(RE2_LIB):	$(RE2_Objs)
 libcds:
 	mkdir -p $(LIBCDS)/lib/$(TARGET)
 	cd $(LIBCDS)/lib/$(TARGET); \
-	cmake -DCMAKE_BUILD_TYPE=$(FB_CMAKE_BUILD_TYPE) -DCMAKE_CXX_COMPILER="$(CXX)" -DCMAKE_CXX_FLAGS=-fPIC $(LIBCDS)
+	cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$(FB_CMAKE_BUILD_TYPE) -DCMAKE_CXX_COMPILER="$(CXX)" -DCMAKE_CXX_FLAGS=-fPIC $(LIBCDS)
 	AR="$(AR)" $(MAKE) -C $(LIBCDS)/lib/$(TARGET)
 
 ifeq ($(TARGET),Debug)
@@ -551,10 +555,15 @@ $(LIBIBUTIL_SO): $(UTIL_Objects)
 
 utilities: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup udfsupport
 
+ifeq ($(PLATFORM),win32)
+.PHONY:	instreg instsvc instclient
+utilities +: instreg instsvc instclient
+endif
+
 firebird_server:	$(FB_DAEMON)
 
 $(FB_DAEMON):	$(Remote_Server_Objects) $(COMMON_LIB)
-	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIB_GUI) $(LINK_LIBS)
 
 fb_lock_print:	$(LOCKPRINT)
 
@@ -564,7 +573,7 @@ $(LOCKPRINT):	$(LOCKPRINT_Objects) $(COMMON_LIB)
 fbguard:		$(FBGUARD)
 
 $(FBGUARD):		$(FBGUARD_Objects) $(COMMON_LIB)
-	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIB_GUI) $(LINK_LIBS)
 
 fbsvcmgr:		$(FBSVCMGR)
 
@@ -614,6 +623,21 @@ nbackup:		$(NBACKUP)
 $(NBACKUP):		$(NBACKUP_Objects) $(COMMON_LIB)
 	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
 
+instreg:		$(INSTREG)
+
+$(INSTREG):		$(INSTREG_Objects) $(COMMON_LIB)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+instsvc:		$(INSTSVC)
+
+$(INSTSVC):		$(INSTSVC_Objects) $(COMMON_LIB)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
+instclient:		$(INSTCLIENT)
+
+$(INSTCLIENT):		$(INSTCLIENT_Objects) $(COMMON_LIB)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
+
 
 #___________________________________________________________________________
 # plugins - some of them are required to build examples, use separate entry for them
@@ -636,6 +660,8 @@ ifeq ($(TARGET),Debug)
 	BUILD_DEBUG:=auth_debug
 endif
 
+PLUGIN_SONAME=$(notdir $@).0
+
 plugins: udr legacy_user_management legacy_auth_server srp_user_management trace $(BUILD_DEBUG) udf_compat chacha profiler
 
 udr:	$(UDR_PLUGIN) $(PLUGINS)/udr_engine.conf
@@ -644,31 +670,31 @@ $(PLUGINS)/udr_engine.conf: $(ROOT)/src/plugins/udr_engine/udr_engine.conf
 	cp $^ $@
 
 $(UDR_PLUGIN):	$(UDRENG_Objects) $(COMMON_LIB)
-	$(LINK_UDRENG) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_UDRENG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_UDRENG) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_UDRENG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libudr_engine.$(SHRLIB_EXT))
 
 legacy_user_management:	$(LEGACY_USER_MANAGER)
 
 $(LEGACY_USER_MANAGER):	$(LEGACY_USERS_MANAGE_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(RE2LIB) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(RE2LIB) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libLegacy_UserManager.$(SHRLIB_EXT))
 
 chacha:	$(CHACHA)
 
 $(CHACHA):	$(Chacha_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libChaCha.$(SHRLIB_EXT))
 
 legacy_auth_server:	$(LEGACY_AUTH_SERVER)
 
 $(LEGACY_AUTH_SERVER):	$(LEGACY_AUTH_SERVER_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libLegacy_Auth.$(SHRLIB_EXT))
 
 profiler:	$(PROFILER)
 
 $(PROFILER):	$(Profiler_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libDefault_Profiler.$(SHRLIB_EXT))
 
 trace:	$(FBTRACE)
@@ -679,13 +705,13 @@ $(FBTRACE):	$(FBTRACE_UTIL_Objects) $(COMMON_LIB)
 auth_debug:	$(AUTH_DEBUGGER)
 
 $(AUTH_DEBUGGER):	$(AUTH_DEBUGGER_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libAuth_Debug.$(SHRLIB_EXT))
 
 srp_user_management: $(SRP_USER_MANAGER)
 
 $(SRP_USER_MANAGER):	$(SRP_USERS_MANAGE_Objects) $(COMMON_LIB)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
  $(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libSrp.$(SHRLIB_EXT))
 
 udf_compat:	$(UDF_BACKWARD_COMPATIBILITY) $(COMPAT_SQL)

diff --git a/builds/posix/Makefile.in.examples b/builds/posix/Makefile.in.examples
@@ -67,8 +67,10 @@ export PATH
 #endif
 GPRE_FLAGS=	-m -z -n
 
+ifneq ($(PLATFORM),win32)
 LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),$(LIB),$(LIB)/../intl))
 LINK_DARWIN_RPATH = -Wl,-rpath,@loader_path/../$(TARGET)/firebird
+endif
 LIB_LINK_MAPFILE =
 
 EXAMPLES_DEST=	$(GEN_ROOT)/examples

diff --git a/examples/extauth/Makefile → builds/posix/Makefile.in.extauth b/examples/extauth/Makefile → builds/posix/Makefile.in.extauth
@@ -28,7 +28,9 @@ BIN=$(ROOT)/bin
 LIB=$(ROOT)/lib
 
 LIB_PREFIX=lib
-SHRLIB_EXT=so
+SHRLIB_EXT=@SHRLIB_EXT@
+EXEC_EXT=@EXEEXT@
+PLATFORM=@PLATFORM@
 
 ifndef INTERMED
   INTERMED=.
@@ -42,7 +44,11 @@ else
   OUT_PLUG=.
 endif
 
+ifeq ($(PLATFORM),win32)
+TOMCRYPT_COMPILE=-DUSE_LTM -DLTM_DESC
+else
 TOMCRYPT_COMPILE=-DLTC_PTHREAD -DUSE_LTM -DLTM_DESC
+endif
 OwnInclude=$(shell [ -d tomcrypt.include ] && echo Yes || echo No)
 ifeq ($(OwnInclude), Yes)
 TOMCRYPT_COMPILE += -Itomcrypt.include
@@ -53,16 +59,21 @@ SIMPLE_KEY_AUTH_NAME=$(LIB_PREFIX)fbSampleExtAuth.$(SHRLIB_EXT)
 BLD_SIMPLE_KEY_AUTH=$(OUT_PLUG)/$(SIMPLE_KEY_AUTH_NAME)
 SIMPLE_KEY_AUTH=$(PLUGINS)/$(SIMPLE_KEY_AUTH_NAME)
 
-KEYGEN_NAME=fbSampleExtAuthKeygen
+KEYGEN_NAME=fbSampleExtAuthKeygen$(EXEC_EXT)
 BLD_KEYGEN=$(OUT_BIN)/$(KEYGEN_NAME)
 KEYGEN=$(BIN)/$(KEYGEN_NAME)
 
 KEYGEN_objects=$(INTERMED)/keygen.o
 TCWRAP_objects=$(INTERMED)/TcWrapper.o
 KEY_AUTH_objects=$(INTERMED)/ExtAuth.o
 
-CXXFLAGS=-std=c++11 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
+ifeq ($(PLATFORM),win32)
+CXXFLAGS=-std=c++17 -I$(ROOT)/include $(TOMCRYPT_COMPILE)
+LDFLAGS=-L$(LIB)
+else
+CXXFLAGS=-std=c++17 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
 LDFLAGS=-pthread -L$(LIB) -Wl,-rpath,'$$ORIGIN/../lib' $(TOMCRYPT_LINK)
+endif
 
 LINK_LIBS=-lfbclient -ltomcrypt -ltommath
 

diff --git a/builds/posix/Makefile.in.plugins_examples b/builds/posix/Makefile.in.plugins_examples
@@ -60,6 +60,9 @@ include     $(ROOT)/gen/make.shared.variables
 
 all: udrcpp_example dc_example kh_example crypt_app
 
+PLUGIN_SONAME=$(notdir $@).0
+PLUGINS_DIR=$(PLUGINS)
+SAMPLES_DIR=$(BIN)
 
 UDR_Objects = $(call dirObjects,../examples/udr)
 UDR_Plugin = $(PLUGINS)/udr/$(LIB_PREFIX)udrcpp_example.$(SHRLIB_EXT)
@@ -72,7 +75,7 @@ ifeq ($(PLATFORM),DARWIN)
 	$(LIB_LINK) $(LIB_BUNDLE_OPTIONS) -o $@ $^ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ \
 		$(FIREBIRD_LIBRARY_LINK)
 else
-	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)udrcpp_example.$(SHRLIB_EXT) \
+	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(call LIB_LINK_SONAME,udrcpp_example.$(SHRLIB_EXT)) \
 		$(LIB_PATH_OPTS) -o $@ $^ $(THR_LIBS) \
 		$(FIREBIRD_LIBRARY_LINK)
 endif
@@ -85,8 +88,8 @@ AllObjects += $(DC_Objects)
 dc_example: $(DC_Plugin)
 
 $(DC_Plugin):	$(DC_Objects)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
-	$(CP) $(EXA_ROOT)/dbcrypt/fbSampleDbCrypt.conf $(PLUGINS)
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
+	$(CP) $(EXA_ROOT)/dbcrypt/fbSampleDbCrypt.conf $(PLUGINS_DIR)
 
 
 KH_Objects = $(call makeObjects,../examples/dbcrypt,CryptKeyHolder.cpp)
@@ -96,12 +99,12 @@ AllObjects += $(KH_Objects)
 kh_example: $(KH_Plugin)
 
 $(KH_Plugin):	$(KH_Objects)
-	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
-	$(CP) $(EXA_ROOT)/dbcrypt/fbSampleKeyHolder.conf $(PLUGINS)
+	$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(PLUGIN_SONAME)) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
+	$(CP) $(EXA_ROOT)/dbcrypt/fbSampleKeyHolder.conf $(PLUGINS_DIR)
 
 
 CA_Objects = $(call makeObjects,../examples/dbcrypt,CryptApplication.cpp)
-CRYPT_APP = $(BIN)/fbSampleDbCryptApp$(EXEC_EXT)
+CRYPT_APP = $(SAMPLES_DIR)/fbSampleDbCryptApp$(EXEC_EXT)
 AllObjects += $(CA_Objects)
 
 crypt_app: $(CRYPT_APP)

diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults
@@ -172,7 +172,7 @@ INLINE_EDIT_SED:= -i
 
 SH=			sh -c
 RM=			rm -f
-RM_R=		rm -rf
+RM_R=			rm -rf
 CHMOD=			chmod
 CHMOD_6=		chmod 666
 CHMOD_7=		chmod 777
@@ -196,6 +196,7 @@ CXX =	@CXX@
 LD =	@CXX@
 OBJCOPY = @OBJCOPY@
 READELF = @READELF@
+WINDRES = @WINDRES@
 
 AC_CFLAGS = @CFLAGS@
 AC_CXXFLAGS = @CXXFLAGS@
@@ -215,7 +216,7 @@ SO_LINK_LIBS = @LIBS@ $(DECLIB) $(I128LIB)
 
 ARCH_EXT=		.a
 EXEC_EXT=		@EXEEXT@
-SHRLIB_EXT=@SHRLIB_EXT@
+SHRLIB_EXT=		@SHRLIB_EXT@
 LIB_PREFIX=		lib
 SHRLIB_FOREIGN_EXT=	$(SHRLIB_EXT)
 
@@ -233,7 +234,7 @@ include $(ROOT)/gen/Make.Version
 
 vpath %.so $(LIB)
 vpath %.a $(LIB)
-vpath %.dll $(LIB)
+vpath %.dll $(BIN)
 
 #_____________________________________________________________________________
 
@@ -357,7 +358,7 @@ endif
 LIB_PATH_OPTS = $(call LIB_LINK_RPATH,lib) $(call LIB_LINK_RPATH,intl)
 LIB_LINK_SONAME= -Wl,-soname,$(1)
 LIB_LINK_MAPFILE= -Wl,--version-script,$(1)
-FIREBIRD_LIBRARY_LINK= -L$(LIB) -L$(STATIC_LIB) -lfbclient $(MATHLIB) $(CRYPTLIB)
+FIREBIRD_LIBRARY_LINK= -L$(LIB) -L$(STATIC_LIB) -lfbclient $(CRYPTLIB) $(MATHLIB)
 
 EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(call LINK_DARWIN_RPATH,..) $(LINK_EMPTY_SYMBOLS)
 LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared
@@ -383,7 +384,7 @@ LINK_TRACE_LIBS = -L$(LIB) -L$(STATIC_LIB) $(SO_LINK_LIBS)
 
 LINK_FIREBIRD = $(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_FIREBIRD_OPTIONS) $(UNDEF_FLAGS)\
  $(call LIB_LINK_SONAME,$(LibrarySoName)) $(call LIB_LINK_RPATH,lib) $(call LINK_DARWIN_RPATH,..)
-LINK_FIREBIRD_LIBS = -L$(LIB) -L$(STATIC_LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(MATHLIB)
+LINK_FIREBIRD_LIBS = -L$(LIB) -L$(STATIC_LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(CRYPTLIB) $(MATHLIB)
 
 LINK_ENGINE = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_FIREBIRD_OPTIONS) $(UNDEF_FLAGS)\
  $(call LIB_LINK_SONAME,$(EngineSoName)) $(call LIB_LINK_RPATH,lib) $(call LINK_DARWIN_RPATH,..)
@@ -414,6 +415,7 @@ RUN_GFIX	= $(RBIN)/gfix$(EXEC_EXT)
 FBGUARD		= $(BIN)/fbguard$(EXEC_EXT)
 INSTREG		= $(BIN)/instreg$(EXEC_EXT)
 INSTSVC		= $(BIN)/instsvc$(EXEC_EXT)
+INSTCLIENT	= $(BIN)/instclient$(EXEC_EXT)
 
 SECURITY_FDB	= $(FIREBIRD)/security6.fdb
 

diff --git a/builds/posix/make.rules b/builds/posix/make.rules
@@ -147,8 +147,8 @@ $(OBJ)/%.o: $(ROOT)/%.cpp
 
 # Rules for making resource files
 
-$(GEN_ROOT)/%.res: $(SRC_ROOT)/%.rc
-	windres --output-format=coff --include-dir=$(<D) $< $@
+$(OBJ)/%.res: $(SRC_ROOT)/%.rc
+	$(WINDRES) $(RCFLAGS) --output-format=coff --include-dir=$(<D) $< $@
 
 # Rule for making gbak files when cross-compiling
 

diff --git a/builds/posix/make.shared.targets b/builds/posix/make.shared.targets
@@ -78,17 +78,39 @@ $(OBJ)/dsql/PackageNodes.cpp: $(SRC_ROOT)/dsql/PackageNodes.epp
 
 # Adding resources as prerequisite for some files
 
-$(FilesToAddVersionInfo): $(GEN_ROOT)/jrd/version.res
-$(FilesToAddDialog): $(GEN_ROOT)/remote/os/win32/window.res
-$(FilesToAddDialog2): $(GEN_ROOT)/iscguard/iscguard.res
+$(FilesToAddVersionInfo): $(OBJ)/jrd/version.res
+$(FilesToAddVersionInfo2): $(OBJ)/yvalve/config/os/win32/version.res
+$(FilesToAddVersionInfo3): $(OBJ)/jrd/os/win32/version.res
+$(FilesToAddVersionInfo4): $(OBJ)/intl/version.res
+$(FilesToAddVersionInfo5): $(OBJ)/extlib/version.res
+$(FilesToAddDialog): $(OBJ)/remote/server/os/win32/window.res
+$(FilesToAddDialog2): $(OBJ)/iscguard/iscguard.res
 
 # Explicit dependence of resource script
-$(GEN_ROOT)/remote/os/win32/window.res: $(SRC_ROOT)/remote/os/win32/window.rc $(SRC_ROOT)/remote/os/win32/window.rh \
- $(SRC_ROOT)/jrd/version.rc $(SRC_ROOT)/jrd/build_no.h $(SRC_ROOT)/remote/os/win32/property.rc \
- $(SRC_ROOT)/remote/os/win32/property.rh
 
-$(GEN_ROOT)/iscguard/iscguard.res: $(SRC_ROOT)/iscguard/iscguard.rc $(SRC_ROOT)/iscguard/iscguard.rh \
- $(SRC_ROOT)/jrd/version.rc
+# fbclient.dll
+$(OBJ)/yvalve/config/os/win32/version.res: $(SRC_ROOT)/jrd/version.rc
+	$(WINDRES) $(RCFLAGS) -DRC_TARGET_fbclient --output-format=coff --include-dir=$(<D) $< $@
+
+# engine14.dll
+$(OBJ)/jrd/os/win32/version.res: $(SRC_ROOT)/jrd/version.rc
+	$(WINDRES) $(RCFLAGS) -DRC_TARGET_engine14 --output-format=coff --include-dir=$(<D) $< $@
+
+# fbintl.dll
+$(OBJ)/intl/version.res: $(SRC_ROOT)/jrd/version.rc
+	$(WINDRES) $(RCFLAGS) -DRC_TARGET_fbintl --output-format=coff --include-dir=$(<D) $< $@
+
+# ib_util.dll
+$(OBJ)/extlib/version.res: $(SRC_ROOT)/jrd/version.rc
+	$(WINDRES) $(RCFLAGS) -DRC_TARGET_ib_util --output-format=coff --include-dir=$(<D) $< $@
+
+# firebird.exe
+$(OBJ)/remote/server/os/win32/window.res: $(SRC_ROOT)/remote/server/os/win32/window.rc
+	$(WINDRES) $(RCFLAGS) -DRC_TARGET_firebird --output-format=coff --include-dir=$(<D) $< $@
+
+# fbguard.exe
+$(OBJ)/iscguard/iscguard.res: $(SRC_ROOT)/iscguard/iscguard.rc
+	$(WINDRES) $(RCFLAGS) -DRC_TARGET_fbguard --output-format=coff --include-dir=$(<D) $< $@
 
 .PHONY: FORCE