Skip to content

Improve system libraries dependency control #9209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfernandes merged 6 commits into from
Oct 11, 2026
Merged

Improve system libraries dependency control #9209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d06c814
Do not copy include/firebird/impl/boost when --with-system-boost is used
asfernandes Oct 10, 2026
2b9ba5d
Add WITH_SYSTEM_BOOST option to the Windows build
asfernandes Oct 10, 2026
555e6af
Add WITH_SYSTEM_TOMMATH, WITH_SYSTEM_TOMCRYPT, WITH_SYSTEM_ZLIB and W…
asfernandes Oct 10, 2026
2232fea
Use RE2 StringPiece/string_view data() instead of begin()
asfernandes Oct 11, 2026
8bf3b41
Detect libtommath 1.2+ API
asfernandes Oct 11, 2026
c65e290
Use Alpine 3.22.1 container in CI to fix Node 24 runner failure
asfernandes Oct 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
build-alpine-x64:
if: github.ref_type != 'tag'
runs-on: ubuntu-22.04
container: alpine:3.14
container: alpine:3.22.1

steps:
- name: Checkout
Expand Down
5 changes: 4 additions & 1 deletion builds/posix/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,13 +764,16 @@ $(INCLUDE_DEST)/ib_util.h : $(SRC_OtherDistribHeaders)
$(CP) $^ $(INCLUDE_DEST)/

NEW_INCLUDES_SRC = $(shell find $(SRC_ROOT)/include/firebird -type f)
ifeq ($(SYSTEM_BOOST_FLG),Y)
NEW_INCLUDES_SRC := $(filter-out $(SRC_ROOT)/include/firebird/impl/boost/%,$(NEW_INCLUDES_SRC))
endif
NEW_INCLUDES_DEST = $(patsubst $(SRC_ROOT)/include/firebird/%, $(INCLUDE_DEST)/firebird/%, $(NEW_INCLUDES_SRC))

include_generic: $(NEW_INCLUDES_DEST) $(INCLUDE_DEST)/ib_util.h

ifeq ($(SYSTEM_BOOST_FLG),Y)
$(INCLUDE_DEST)/firebird/Message.h : $(SRC_ROOT)/include/firebird/Message.h
sed 's,^#include "\./impl/boost/\(.\+\)",#include <boost/\1>,; s/\bFB_BOOST_PP_/BOOST_PP_/g' $< > $@
sed 's,^#include "\./impl/boost/\(.*\)",#include <boost/\1>,; s/FB_BOOST_PP_/BOOST_PP_/g' $< > $@
endif

$(INCLUDE_DEST)/firebird/%: $(SRC_ROOT)/include/firebird/%
Expand Down
6 changes: 6 additions & 0 deletions builds/win32/make_all.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ copy %FB_GEN_DIR%\iberror_c.h %FB_OUTPUT_DIR%\include\firebird\impl > nul
:: New API headers
xcopy /y %FB_ROOT_PATH%\src\include\firebird %FB_OUTPUT_DIR%\include\firebird /e > nul

:: With system boost, do not distribute the embedded copy and make Message.h use <boost/...> and BOOST_PP_
@if exist %FB_TEMP_DIR%\FirebirdSystemLibs.props (
rmdir /S /Q %FB_OUTPUT_DIR%\include\firebird\impl\boost 2>nul
powershell -NoProfile -Command "(Get-Content '%FB_ROOT_PATH%\src\include\firebird\Message.h') -replace '^#include \x22\./impl/boost/(.+)\x22', '#include <boost/$1>' -replace '\bFB_BOOST_PP_', 'BOOST_PP_' | Set-Content -Encoding ascii '%FB_OUTPUT_DIR%\include\firebird\Message.h'"
)

@if "%FB_CLIENT_ONLY%"=="" (
:: UDR
copy %FB_ROOT_PATH%\src\extlib\*.sql %FB_OUTPUT_DIR%\plugins\udr > nul
Expand Down
91 changes: 80 additions & 11 deletions builds/win32/make_boot.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ for %%v in ( alice auth burp dsql gpre isql jrd misc msgs examples yvalve utilit

@mkdir %FB_BIN_DIR%\tzdata 2>nul

call :system_libs_config

@if not defined FBBUILD_WITHOUT_CLOOP_GENERATION call :interfaces
if "!ERRLEV!"=="1" goto :END

Expand All @@ -41,8 +43,10 @@ if "!ERRLEV!"=="1" goto :END
if "%FB_TARGET_PLATFORM%"=="x64" call :ttmath
if "!ERRLEV!"=="1" goto :END

call :zlib
if "!ERRLEV!"=="1" goto :END
@if not defined FBBUILD_WITH_SYSTEM_ZLIB (
call :zlib
if "!ERRLEV!"=="1" goto :END
)

@if "%FB_CLIENT_ONLY%"=="" (
call :re2
Expand Down Expand Up @@ -101,10 +105,14 @@ for %%v in (firebird plugins) do (
)

:: Copy ICU and zlib to the output directory
@copy %FB_ROOT_PATH%\extern\icu\icudt???.dat %FB_BIN_DIR% >nul 2>&1
@copy %FB_ICU_SOURCE_BIN%\*.dll %FB_BIN_DIR% >nul 2>&1
@if not defined FBBUILD_WITH_SYSTEM_ICU (
@copy %FB_ROOT_PATH%\extern\icu\icudt???.dat %FB_BIN_DIR% >nul 2>&1
@copy %FB_ICU_SOURCE_BIN%\*.dll %FB_BIN_DIR% >nul 2>&1
)
@copy %FB_ROOT_PATH%\extern\icu\tzdata-extract\* %FB_BIN_DIR%\tzdata >nul 2>&1
@copy %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM%\*.dll %FB_BIN_DIR% >nul 2>&1
@if not defined FBBUILD_WITH_SYSTEM_ZLIB (
@copy %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM%\*.dll %FB_BIN_DIR% >nul 2>&1
)

@if "%FB_CLIENT_ONLY%"=="" (
::=======
Expand All @@ -129,6 +137,63 @@ for %%v in (firebird plugins) do (
@goto :END


::===================
:: Record the system libraries choice in a props file used by all later builds (including the IDE)
:system_libs_config
@mkdir %FB_TEMP_DIR% 2>nul
@set SYSLIBS_PROPS=%FB_TEMP_DIR%\FirebirdSystemLibs.props
@del "%SYSLIBS_PROPS%" 2>nul
@set SYSLIBS_ANY=
@if defined FBBUILD_WITH_SYSTEM_BOOST set SYSLIBS_ANY=1
@if defined FBBUILD_WITH_SYSTEM_TOMMATH set SYSLIBS_ANY=1
@if defined FBBUILD_WITH_SYSTEM_TOMCRYPT set SYSLIBS_ANY=1
@if defined FBBUILD_WITH_SYSTEM_ZLIB set SYSLIBS_ANY=1
@if defined FBBUILD_WITH_SYSTEM_ICU set SYSLIBS_ANY=1
@if not defined SYSLIBS_ANY goto :EOF
@echo ^<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"^>> "%SYSLIBS_PROPS%"
@echo ^<PropertyGroup^>>> "%SYSLIBS_PROPS%"
@if defined FBBUILD_WITH_SYSTEM_BOOST (
@echo Using system boost headers
@echo ^<FbBoostIncludeDir^>^</FbBoostIncludeDir^>>> "%SYSLIBS_PROPS%"
)
@if defined FBBUILD_WITH_SYSTEM_TOMMATH (
@echo Using system libtommath
@echo ^<FbTomMathIncludeDir^>^</FbTomMathIncludeDir^>>> "%SYSLIBS_PROPS%"
@echo ^<FbTomMathLib^>tommath.lib^</FbTomMathLib^>>> "%SYSLIBS_PROPS%"
call :tommath_probe
)
@if defined FBBUILD_WITH_SYSTEM_TOMCRYPT (
@echo Using system libtomcrypt
@echo ^<FbTomCryptIncludeDir^>^</FbTomCryptIncludeDir^>>> "%SYSLIBS_PROPS%"
@echo ^<FbTomCryptLib^>tomcrypt.lib^</FbTomCryptLib^>>> "%SYSLIBS_PROPS%"
)
@if defined FBBUILD_WITH_SYSTEM_ZLIB (
@echo Using system zlib
@echo ^<FbZlibIncludeDir^>^</FbZlibIncludeDir^>>> "%SYSLIBS_PROPS%"
)
@if defined FBBUILD_WITH_SYSTEM_ICU (
@echo Using system ICU
@echo ^<FbIcuIncludeDir^>^</FbIcuIncludeDir^>>> "%SYSLIBS_PROPS%"
)
@echo ^</PropertyGroup^>>> "%SYSLIBS_PROPS%"
@echo ^</Project^>>> "%SYSLIBS_PROPS%"
@goto :EOF

:: Check whether the system libtommath has the 1.2+ API (mp_to_ubin and others)
:tommath_probe
@set TOMMATH_PROBE=%FB_TEMP_DIR%\tommath_probe.cpp
@echo #include ^<tommath.h^>> "%TOMMATH_PROBE%"
@echo int main() { mp_int a; size_t n; return (int) mp_to_ubin(^&a, 0, 0, ^&n); }>> "%TOMMATH_PROBE%"
@cl /nologo /Zs /TP "%TOMMATH_PROBE%" >nul 2>&1
@if errorlevel 1 (
@echo libtommath 1.2+ API not found
) else (
@echo libtommath 1.2+ API found
@echo ^<FbTomMathDefines^>HAVE_TOMMATH_1_2_API;^</FbTomMathDefines^>>> "%SYSLIBS_PROPS%"
)
@del "%TOMMATH_PROBE%" 2>nul
@goto :EOF

::===================
:: BUILD btyacc
:btyacc
Expand All @@ -142,12 +207,16 @@ goto :EOF
:: BUILD LibTom
:LibTom
@echo.
@echo Building LibTomMath (%FB_OBJ_DIR%)...
@call compile.bat extern\libtommath\libtommath_MSVC%MSVC_VERSION% libtommath_%FB_CONFIG%_%FB_TARGET_PLATFORM%.log libtommath
if errorlevel 1 call :boot2 libtommath_%FB_OBJ_DIR%
@echo Building LibTomCrypt (%FB_OBJ_DIR%)...
@call compile.bat extern\libtomcrypt\libtomcrypt_MSVC%MSVC_VERSION% libtomcrypt_%FB_CONFIG%_%FB_TARGET_PLATFORM%.log libtomcrypt
if errorlevel 1 call :boot2 libtomcrypt_%FB_OBJ_DIR%
@if not defined FBBUILD_WITH_SYSTEM_TOMMATH (
@echo Building LibTomMath ^(%FB_OBJ_DIR%^)...
@call compile.bat extern\libtommath\libtommath_MSVC%MSVC_VERSION% libtommath_%FB_CONFIG%_%FB_TARGET_PLATFORM%.log libtommath
if errorlevel 1 call :boot2 libtommath_%FB_OBJ_DIR%
)
@if not defined FBBUILD_WITH_SYSTEM_TOMCRYPT (
@echo Building LibTomCrypt ^(%FB_OBJ_DIR%^)...
@call compile.bat extern\libtomcrypt\libtomcrypt_MSVC%MSVC_VERSION% libtomcrypt_%FB_CONFIG%_%FB_TARGET_PLATFORM%.log libtomcrypt
if errorlevel 1 call :boot2 libtomcrypt_%FB_OBJ_DIR%
)
goto :EOF

::===================
Expand Down
9 changes: 8 additions & 1 deletion builds/win32/make_icu.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,14 @@ if not defined FB_UNZIP (

if not exist "%FB_UNZIP%" set FB_UNZIP=

if not defined FB_UNZIP (
if defined FBBUILD_WITH_SYSTEM_ICU (
@echo Using system ICU, extracting tzdata only
if not defined FB_UNZIP (
cscript /nologo unzip.vbs %FB_ROOT_PATH%\extern\icu\tzdata\le.zip %FB_ROOT_PATH%\extern\icu\tzdata-extract
) else (
"%FB_UNZIP%" -o %FB_ROOT_PATH%\extern\icu\tzdata\le.zip -d %FB_ROOT_PATH%\extern\icu\tzdata-extract
)
) else if not defined FB_UNZIP (
cscript /nologo unzip.vbs %FB_ROOT_PATH%\extern\icu\icu_windows.zip %FB_ROOT_PATH%\extern\icu
cscript /nologo unzip.vbs %FB_ROOT_PATH%\extern\icu\icudt.zip %FB_ROOT_PATH%\extern\icu
cscript /nologo unzip.vbs %FB_ROOT_PATH%\extern\icu\tzdata\le.zip %FB_ROOT_PATH%\extern\icu\tzdata-extract
Expand Down
14 changes: 12 additions & 2 deletions builds/win32/msvc15/FirebirdCommon.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,22 @@
<OutDir>..\..\..\temp\$(PlatformName)\$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>..\..\..\temp\$(PlatformName)\$(Configuration)\$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<FbBoostIncludeDir>../../../extern/boost;</FbBoostIncludeDir>
<FbTomMathIncludeDir>../../../extern/libtommath;</FbTomMathIncludeDir>
<FbTomMathLib>../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib</FbTomMathLib>
<FbTomMathDefines></FbTomMathDefines>
<FbTomCryptIncludeDir>../../../extern/libtomcrypt/src/headers;</FbTomCryptIncludeDir>
<FbTomCryptLib>../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib</FbTomCryptLib>
<FbZlibIncludeDir>../../../extern/zlib;</FbZlibIncludeDir>
<FbIcuIncludeDir>../../../extern/icu/include;</FbIcuIncludeDir>
</PropertyGroup>
<!-- Generated by make_boot.bat WITH_SYSTEM_* options; overrides the Fb*IncludeDir and Fb*Lib properties above -->
<Import Project="$(MSBuildThisFileDirectory)..\..\..\temp\$(Platform)\FirebirdSystemLibs.props" Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\temp\$(Platform)\FirebirdSystemLibs.props')" />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalOptions>/EHsc- %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtomcrypt/src/headers;../../../extern/libtommath;../../../extern/icu/include;../../../extern/zlib;../../../extern/re2;../../../extern/boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;$(FbTomCryptIncludeDir)$(FbTomMathIncludeDir)$(FbIcuIncludeDir)$(FbZlibIncludeDir)../../../extern/re2;$(FbBoostIncludeDir)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
Expand All @@ -27,7 +37,7 @@
<CompileAs>Default</CompileAs>
<UseFullPaths>false</UseFullPaths>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(FbTomMathDefines)%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SuppressStartupBanner>true</SuppressStartupBanner>
Expand Down
8 changes: 4 additions & 4 deletions builds/win32/msvc15/common.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;SUPERSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;$(FbTomMathLib);$(FbTomCryptLib);../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand All @@ -331,7 +331,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;$(FbTomMathLib);$(FbTomCryptLib);../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -342,7 +342,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;SUPERSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;../../../extern/ttmath\$(Configuration)\ttmathuint_x86_64_msvc.obj;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;$(FbTomMathLib);$(FbTomCryptLib);../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;../../../extern/ttmath\$(Configuration)\ttmathuint_x86_64_msvc.obj;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -356,7 +356,7 @@
</PrecompiledHeader>
</ClCompile>
<Lib>
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/libtomcrypt/lib/$(PlatformName)\$(Configuration)\tomcrypt.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;../../../extern/ttmath\$(Configuration)\ttmathuint_x86_64_msvc.obj;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ws2_32.lib;$(FbTomMathLib);$(FbTomCryptLib);../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;../../../extern/ttmath\$(Configuration)\ttmathuint_x86_64_msvc.obj;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
4 changes: 2 additions & 2 deletions builds/win32/msvc15/engine.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;$(FbIcuIncludeDir)../../../src/vulcan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_LIB;SUPERSERVER;DEV_BUILD;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
Expand Down Expand Up @@ -221,7 +221,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;$(FbIcuIncludeDir)../../../src/vulcan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;SUPERSERVER;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
Expand Down
4 changes: 2 additions & 2 deletions builds/win32/msvc15/engine_static.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;$(FbIcuIncludeDir)../../../src/vulcan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_LIB;SUPERSERVER;DEV_BUILD;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
Expand All @@ -509,7 +509,7 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;$(FbIcuIncludeDir)../../../src/vulcan;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;SUPERSERVER;NAMESPACE=Vulcan;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
Expand Down
20 changes: 20 additions & 0 deletions builds/win32/run_all.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ set FBBUILD_BUILD_ONLY=0
set FBBUILD_KITS=ISX ZIP
set FBBUILD_TEST_ONLY=
set FBBUILD_WITHOUT_CLOOP_GENERATION=
set FBBUILD_WITH_SYSTEM_BOOST=
set FBBUILD_WITH_SYSTEM_TOMMATH=
set FBBUILD_WITH_SYSTEM_TOMCRYPT=
set FBBUILD_WITH_SYSTEM_ZLIB=
set FBBUILD_WITH_SYSTEM_ICU=
set FB2_SNAPSHOT=

::Check if on-line help is required
Expand Down Expand Up @@ -84,6 +89,21 @@ goto :END
@echo.
@echo WITHOUT_CLOOP_GENERATION - omit Cloop build and interface generation
@echo.
@echo WITH_SYSTEM_BOOST - use boost headers from the system include path
@echo instead of extern\boost
@echo.
@echo WITH_SYSTEM_TOMMATH - use libtommath headers and tommath.lib from the system
@echo include/lib paths instead of extern\libtommath
@echo.
@echo WITH_SYSTEM_TOMCRYPT - use libtomcrypt headers and tomcrypt.lib from the system
@echo include/lib paths instead of extern\libtomcrypt
@echo.
@echo WITH_SYSTEM_ZLIB - use zlib headers from the system include path and do not
@echo distribute zlib1.dll (instead of extern\zlib)
@echo.
@echo WITH_SYSTEM_ICU - use ICU headers from the system include path and do not
@echo distribute ICU libraries and icudt (instead of extern\icu)
@echo.
@echo REALCLEAN - Run CLEAN_ALL.BAT REALCLEAN
@echo This will do a deeper clean.
@echo Recommended for multi-platform builds
Expand Down
10 changes: 10 additions & 0 deletions builds/win32/setenvvar.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ set FB_CLEAN=
for %%v in ( %* ) do (
( if /I "%%v"=="DEBUG" ( (set FB_DBG=TRUE) && (set FB_CONFIG=debug) ) )
( if /I "%%v"=="WITHOUT_CLOOP_GENERATION" (set FBBUILD_WITHOUT_CLOOP_GENERATION=1) )
( if /I "%%v"=="WITH_SYSTEM_BOOST" (set FBBUILD_WITH_SYSTEM_BOOST=1) )
( if /I "%%v"=="WITH_SYSTEM_TOMMATH" (set FBBUILD_WITH_SYSTEM_TOMMATH=1) )
( if /I "%%v"=="WITH_SYSTEM_TOMCRYPT" (set FBBUILD_WITH_SYSTEM_TOMCRYPT=1) )
( if /I "%%v"=="WITH_SYSTEM_ZLIB" (set FBBUILD_WITH_SYSTEM_ZLIB=1) )
( if /I "%%v"=="WITH_SYSTEM_ICU" (set FBBUILD_WITH_SYSTEM_ICU=1) )
( if /I "%%v"=="CLEAN" (set FB_CLEAN=:rebuild) )
( if /I "%%v"=="RELEASE" ( (set FB_DBG=) && (set FB_CONFIG=release) ) )
( if /I "%%v"=="CLIENT_ONLY" (set FB_CLIENT_ONLY=TRUE) )
Expand Down Expand Up @@ -205,6 +210,11 @@ goto :END
@echo FB_VSCOMNTOOLS=%FB_VSCOMNTOOLS%
@echo platform=%FB_TARGET_PLATFORM%
@if defined FBBUILD_WITHOUT_CLOOP_GENERATION echo without_cloop_generation=yes
@if defined FBBUILD_WITH_SYSTEM_BOOST echo with_system_boost=yes
@if defined FBBUILD_WITH_SYSTEM_TOMMATH echo with_system_tommath=yes
@if defined FBBUILD_WITH_SYSTEM_TOMCRYPT echo with_system_tomcrypt=yes
@if defined FBBUILD_WITH_SYSTEM_ZLIB echo with_system_zlib=yes
@if defined FBBUILD_WITH_SYSTEM_ICU echo with_system_icu=yes
@echo msvc_version=%MSVC_VERSION%
@echo db_path=%FB_DB_PATH%
@echo root_path=%FB_ROOT_PATH%
Expand Down
2 changes: 2 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,8 @@ else
LIBS=
AC_CHECK_LIB(tommath, mp_init, MATHLIB=-ltommath,
AC_MSG_ERROR(Library tommath not found - please install development tommath package or use --with-builtin-tommath))
AC_CHECK_LIB(tommath, mp_to_ubin,
AC_DEFINE(HAVE_TOMMATH_1_2_API, 1, [Define this if libtommath has the 1.2+ API (mp_to_ubin, mp_from_ubin, mp_to_radix)]))
XE_RESTORE_ENV()
fi
AC_SUBST(MATHLIB)
Expand Down
Loading
Loading