Skip to content

Commit 05c1c61

Browse files
hvladhvlad
committed
Support for VC 2013 (MSVC12)
1 parent f1cf5cc commit 05c1c61

File tree

8 files changed

+341
-5
lines changed

8 files changed

+341
-5
lines changed

‎builds/win32/make_boot.bat

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ if "%ERRLEV%"=="1" goto :END
3838
call :LibTomMath
3939
if "%ERRLEV%"=="1" goto :END
4040

41+
call :decNumber
42+
if "%ERRLEV%"=="1" goto :END
43+
4144
call :zlib
4245
if "%ERRLEV%"=="1" goto :END
4346

@@ -133,6 +136,21 @@ if errorlevel 1 call :boot2 libtommath_%FB_OBJ_DIR%
133136
@call set_build_target.bat %*
134137
goto :EOF
135138

139+
::===================
140+
:: BUILD decNumber
141+
:decNumber
142+
@echo.
143+
@call set_build_target.bat %* RELEASE
144+
@echo Building decNumber (%FB_OBJ_DIR%)...
145+
@call compile.bat %FB_ROOT_PATH%\extern\decNumber\msvc\decNumber_MSVC%MSVC_VERSION% decNumber_%FB_OBJ_DIR%_%FB_TARGET_PLATFORM%.log decNumber
146+
if errorlevel 1 call :boot2 decNumber_%FB_OBJ_DIR%
147+
@call set_build_target.bat %* DEBUG
148+
@echo Building decNumber (%FB_OBJ_DIR%)...
149+
@call compile.bat %FB_ROOT_PATH%\extern\decNumber\msvc\decNumber_MSVC%MSVC_VERSION% decNumber_%FB_OBJ_DIR%_%FB_TARGET_PLATFORM%.log decNumber
150+
if errorlevel 1 call :boot2 decNumber_%FB_OBJ_DIR%
151+
@call set_build_target.bat %*
152+
goto :EOF
153+
136154
::===================
137155
:: Extract zlib
138156
:zlib

‎builds/win32/msvc12/common.vcxproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
</ClCompile>
5959
<ClCompile Include="..\..\..\src\common\cvt.cpp" />
6060
<ClCompile Include="..\..\..\src\common\db_alias.cpp" />
61+
<ClCompile Include="..\..\..\src\common\DecFloat.cpp" />
6162
<ClCompile Include="..\..\..\src\common\dllinst.cpp" />
6263
<ClCompile Include="..\..\..\src\common\dsc.cpp" />
6364
<ClCompile Include="..\..\..\src\common\DynamicStrings.cpp" />
@@ -154,6 +155,7 @@
154155
<ClInclude Include="..\..\..\src\common\CsConvert.h" />
155156
<ClInclude Include="..\..\..\src\common\cvt.h" />
156157
<ClInclude Include="..\..\..\src\common\db_alias.h" />
158+
<ClInclude Include="..\..\..\src\common\DecFloat.h" />
157159
<ClInclude Include="..\..\..\src\common\dllinst.h" />
158160
<ClInclude Include="..\..\..\src\common\dsc.h" />
159161
<ClInclude Include="..\..\..\src\common\dsc_proto.h" />
@@ -283,7 +285,7 @@
283285
<Culture>0x041d</Culture>
284286
</ResourceCompile>
285287
<Lib>
286-
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Release\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
288+
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
287289
</Lib>
288290
</ItemDefinitionGroup>
289291
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -299,7 +301,7 @@
299301
<Culture>0x041d</Culture>
300302
</ResourceCompile>
301303
<Lib>
302-
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Debug\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
304+
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
303305
</Lib>
304306
</ItemDefinitionGroup>
305307
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -318,7 +320,7 @@
318320
<Culture>0x041d</Culture>
319321
</ResourceCompile>
320322
<Lib>
321-
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Release\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
323+
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
322324
</Lib>
323325
</ItemDefinitionGroup>
324326
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -336,7 +338,7 @@
336338
<Culture>0x041d</Culture>
337339
</ResourceCompile>
338340
<Lib>
339-
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\Debug\tommath.lib;%(AdditionalDependencies)</AdditionalDependencies>
341+
<AdditionalDependencies>ws2_32.lib;../../../extern/libtommath/lib/$(PlatformName)\$(Configuration)\tommath.lib;../../../extern/decNumber/lib/$(PlatformName)\$(Configuration)\decnumber.lib;%(AdditionalDependencies)</AdditionalDependencies>
340342
</Lib>
341343
</ItemDefinitionGroup>
342344
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎builds/win32/msvc12/common.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,9 @@
216216
<ClCompile Include="..\..\..\src\common\CRC32C.cpp">
217217
<Filter>common</Filter>
218218
</ClCompile>
219+
<ClCompile Include="..\..\..\src\common\DecFloat.cpp">
220+
<Filter>classes</Filter>
221+
</ClCompile>
219222
</ItemGroup>
220223
<ItemGroup>
221224
<ClInclude Include="..\..\..\src\common\xdr_proto.h">
@@ -530,5 +533,8 @@
530533
<ClInclude Include="..\..\..\src\common\Tokens.h">
531534
<Filter>headers</Filter>
532535
</ClInclude>
536+
<ClInclude Include="..\..\..\src\common\DecFloat.h">
537+
<Filter>headers</Filter>
538+
</ClInclude>
533539
</ItemGroup>
534540
</Project>

‎extern/decNumber/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
temp/
2+
lib/

‎extern/decNumber/msvc/decNumber_MSVC12.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.31101.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decNumber", "decNumber_MSVC12.vcxproj", "{BE4D2DDC-59A0-4CD7-848E-231E13785335}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Win32 = Debug|Win32
11+
Debug|x64 = Debug|x64
12+
Release|Win32 = Release|Win32
13+
Release|x64 = Release|x64
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Debug|Win32.ActiveCfg = Debug|Win32
17+
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Debug|Win32.Build.0 = Debug|Win32
18+
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Debug|x64.ActiveCfg = Debug|x64
19+
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Debug|x64.Build.0 = Debug|x64
20+
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Release|Win32.ActiveCfg = Release|Win32
21+
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Release|Win32.Build.0 = Release|Win32
22+
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Release|x64.ActiveCfg = Release|x64
23+
{BE4D2DDC-59A0-4CD7-848E-231E13785335}.Release|x64.Build.0 = Release|x64
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
EndGlobal

0 commit comments

Comments
 (0)