Skip to content

Commit 68a2f20

Browse files
committed
Moved ttmathuint_x86_64_msvc.obj from common (%FB_TEMP_DIR%\..\%FB_OBJ_DIR%\common) into dedicated folder (%FB_ROOT_PATH%\extern\ttmath\%FB_CONFIG%).
It allows to not call make_boot after cleaning up of "common" project.
1 parent c4162cd commit 68a2f20

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

builds/win32/make_boot.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ goto :EOF
140140
:ttmath
141141
@echo.
142142
@echo Building ttmath (%FB_OBJ_DIR%)...
143-
@mkdir %FB_TEMP_DIR%\..\%FB_OBJ_DIR%\common 2>nul
143+
@mkdir %FB_ROOT_PATH%\extern\ttmath\%FB_CONFIG% 2>nul
144144
if /I "%FB_CONFIG%"=="debug" (
145-
@ml64.exe /c /Zi /Fo %FB_TEMP_DIR%\..\%FB_OBJ_DIR%\common\ttmathuint_x86_64_msvc.obj %FB_ROOT_PATH%\extern\ttmath\ttmathuint_x86_64_msvc.asm
145+
@ml64.exe /c /Zi /Fo %FB_ROOT_PATH%\extern\ttmath\%FB_CONFIG%\ttmathuint_x86_64_msvc.obj %FB_ROOT_PATH%\extern\ttmath\ttmathuint_x86_64_msvc.asm
146146
) else (
147-
@ml64.exe /c /Fo %FB_TEMP_DIR%\..\%FB_OBJ_DIR%\common\ttmathuint_x86_64_msvc.obj %FB_ROOT_PATH%\extern\ttmath\ttmathuint_x86_64_msvc.asm
147+
@ml64.exe /c /Fo %FB_ROOT_PATH%\extern\ttmath\%FB_CONFIG%\ttmathuint_x86_64_msvc.obj %FB_ROOT_PATH%\extern\ttmath\ttmathuint_x86_64_msvc.asm
148148
)
149149
if errorlevel 1 call :boot2 ttmath_%FB_OBJ_DIR%
150150
goto :EOF

builds/win32/msvc15/common.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<ClInclude Include="..\..\..\src\common\isc_s_proto.h" />
192192
<ClInclude Include="..\..\..\src\common\keywords.h" />
193193
<ClInclude Include="..\..\..\src\common\MsgMetadata.h" />
194-
<ClInclude Include="..\..\..\src\common\MsgUtil.h" />
194+
<ClInclude Include="..\..\..\src\common\MsgUtil.h" />
195195
<ClInclude Include="..\..\..\src\common\os\divorce.h" />
196196
<ClInclude Include="..\..\..\src\common\os\fbsyslog.h" />
197197
<ClInclude Include="..\..\..\src\common\os\guid.h" />
@@ -341,7 +341,7 @@
341341
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;SUPERSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
342342
</ClCompile>
343343
<Lib>
344-
<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;$(TargetDir)\ttmathuint_x86_64_msvc.obj;../../../extern/re2/builds/$(PlatformName)\$(Configuration)\re2.lib;%(AdditionalDependencies)</AdditionalDependencies>
344+
<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;../../../extern/re2/builds/$(PlatformName)\$(Configuration)\re2.lib;%(AdditionalDependencies)</AdditionalDependencies>
345345
</Lib>
346346
</ItemDefinitionGroup>
347347
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -355,7 +355,7 @@
355355
</PrecompiledHeader>
356356
</ClCompile>
357357
<Lib>
358-
<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/re2/builds/$(PlatformName)\$(Configuration)\re2.lib;$(TargetDir)\ttmathuint_x86_64_msvc.obj;%(AdditionalDependencies)</AdditionalDependencies>
358+
<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;../../../extern/re2/builds/$(PlatformName)\$(Configuration)\re2.lib;%(AdditionalDependencies)</AdditionalDependencies>
359359
</Lib>
360360
</ItemDefinitionGroup>
361361
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

0 commit comments

Comments
 (0)