Skip to content

Commit 08a3629

Browse files
ladislav-zezulaladislav-zezula
committed
+ Full support for VS 2015
+ Removed support for VS 2012 + Fixed bug on ANSI buids (Mac)
1 parent f0f1245 commit 08a3629

8 files changed

+1996
-3732
lines changed

‎StormLib_dll.vcproj

-2,655
This file was deleted.

‎StormLib_test.vcproj renamed to ‎StormLib_vs08_test.vcproj

File renamed without changes.

‎StormLib_vs12.sln

-67
This file was deleted.

‎StormLib_vs12.vcxproj

-931
This file was deleted.

‎StormLib_vs15_dll.vcxproj

+529
Large diffs are not rendered by default.

‎StormLib_vs12.vcxproj.filters renamed to ‎StormLib_vs15_dll.vcxproj.filters

+87-79
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,67 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<Filter Include="Doc Files">
5-
<UniqueIdentifier>{595d6bc1-89d0-4fb8-98f6-be35e73727c4}</UniqueIdentifier>
5+
<UniqueIdentifier>{b352ea2c-4169-4b60-85bc-82eadd5a9d2e}</UniqueIdentifier>
66
</Filter>
77
<Filter Include="Header Files">
8-
<UniqueIdentifier>{721663d8-8692-476f-b0fd-71fdadf69929}</UniqueIdentifier>
8+
<UniqueIdentifier>{9171b211-949a-4dc1-a028-edf0a2ed4605}</UniqueIdentifier>
99
</Filter>
1010
<Filter Include="Source Files">
11-
<UniqueIdentifier>{9cc24144-d198-4bd1-b941-b946bd61b982}</UniqueIdentifier>
11+
<UniqueIdentifier>{712a20a0-c7a8-4e56-947b-2cf030bbb287}</UniqueIdentifier>
1212
</Filter>
1313
<Filter Include="Source Files\adpcm">
14-
<UniqueIdentifier>{be0080d3-fc04-4442-9e28-b4cc2641177d}</UniqueIdentifier>
14+
<UniqueIdentifier>{83502600-f49c-43b1-afe6-038d3560a859}</UniqueIdentifier>
1515
</Filter>
1616
<Filter Include="Source Files\bzip2">
17-
<UniqueIdentifier>{adb84a97-8a0c-4988-9473-452326110dff}</UniqueIdentifier>
17+
<UniqueIdentifier>{ea8b08a3-5c21-48e0-b75f-78eaa2adbc22}</UniqueIdentifier>
1818
</Filter>
1919
<Filter Include="Source Files\huffman">
20-
<UniqueIdentifier>{87256d6a-e658-4f60-8759-6bff32a35eb2}</UniqueIdentifier>
20+
<UniqueIdentifier>{593ac5e7-fe06-42b8-8025-e3bd725f95d8}</UniqueIdentifier>
2121
</Filter>
2222
<Filter Include="Source Files\libtomcrypt">
23-
<UniqueIdentifier>{d730d7c1-2960-49d2-ba0d-d1a91dd08964}</UniqueIdentifier>
23+
<UniqueIdentifier>{9887a885-78fa-4164-80b9-9db6b0c11f86}</UniqueIdentifier>
2424
</Filter>
2525
<Filter Include="Source Files\libtomcrypt\hashes">
26-
<UniqueIdentifier>{13e5ccb1-06f1-4d10-bdc1-825b51c64dbf}</UniqueIdentifier>
26+
<UniqueIdentifier>{7db62947-d38d-48e9-8b52-4cad226394a6}</UniqueIdentifier>
2727
</Filter>
2828
<Filter Include="Source Files\libtomcrypt\math">
29-
<UniqueIdentifier>{73f7f025-7366-4d76-8d60-4327e00b9d18}</UniqueIdentifier>
29+
<UniqueIdentifier>{b435fecf-9a65-4f2e-8d64-7dfc70de3137}</UniqueIdentifier>
3030
</Filter>
3131
<Filter Include="Source Files\libtomcrypt\misc">
32-
<UniqueIdentifier>{be21c641-7727-4d7b-919e-c895d801db17}</UniqueIdentifier>
32+
<UniqueIdentifier>{d8ad7878-9e42-427a-b5b6-ae51d92b92cf}</UniqueIdentifier>
3333
</Filter>
3434
<Filter Include="Source Files\libtomcrypt\pk">
35-
<UniqueIdentifier>{694a7758-f909-4b8e-aa13-4d06a8c70eff}</UniqueIdentifier>
35+
<UniqueIdentifier>{07806629-c061-49ed-8212-0585d25fae23}</UniqueIdentifier>
3636
</Filter>
3737
<Filter Include="Source Files\libtomcrypt\pk\asn1">
38-
<UniqueIdentifier>{3f01cae6-5676-4f33-bb38-215341eedfc4}</UniqueIdentifier>
38+
<UniqueIdentifier>{ca554d9f-b602-452a-971e-86b537ee2ad1}</UniqueIdentifier>
3939
</Filter>
4040
<Filter Include="Source Files\libtomcrypt\pk\ecc">
41-
<UniqueIdentifier>{63d75851-c430-4c76-aa08-3398523aab4a}</UniqueIdentifier>
41+
<UniqueIdentifier>{46e1697c-e6c2-4a8c-b4d2-0142311bb48b}</UniqueIdentifier>
4242
</Filter>
4343
<Filter Include="Source Files\libtomcrypt\pk\pkcs1">
44-
<UniqueIdentifier>{11175e9e-e9f1-405c-961b-933e72503cdd}</UniqueIdentifier>
44+
<UniqueIdentifier>{99279e07-2e33-44c9-8f37-0b810ee4ba25}</UniqueIdentifier>
4545
</Filter>
4646
<Filter Include="Source Files\libtomcrypt\pk\rsa">
47-
<UniqueIdentifier>{e30512f4-bdf8-4460-823d-475bd8f08d28}</UniqueIdentifier>
47+
<UniqueIdentifier>{04fbcfe0-3023-4fa0-8e36-26ab024a4abf}</UniqueIdentifier>
4848
</Filter>
4949
<Filter Include="Source Files\libtommath">
50-
<UniqueIdentifier>{d2889ef6-3f12-4a9b-8624-8d061748ff03}</UniqueIdentifier>
50+
<UniqueIdentifier>{4720c7a0-f4aa-4737-978c-9efe8b429906}</UniqueIdentifier>
5151
</Filter>
5252
<Filter Include="Source Files\lzma">
53-
<UniqueIdentifier>{02c6dfb8-4a58-46c5-bb35-69ba6215a3a6}</UniqueIdentifier>
53+
<UniqueIdentifier>{856c9964-4d85-40e9-8cbd-f4c672c07780}</UniqueIdentifier>
5454
</Filter>
5555
<Filter Include="Source Files\pklib">
56-
<UniqueIdentifier>{563829a0-aaa3-4af2-88a2-8c6445d2754b}</UniqueIdentifier>
56+
<UniqueIdentifier>{7ad3c876-768a-45bc-85b1-38cd492814ea}</UniqueIdentifier>
5757
</Filter>
5858
<Filter Include="Source Files\sparse">
59-
<UniqueIdentifier>{e82b0d03-77ff-46dc-b5a4-5b469224222a}</UniqueIdentifier>
59+
<UniqueIdentifier>{22e86a97-80e9-45a0-ac8e-70d7ea848f35}</UniqueIdentifier>
6060
</Filter>
6161
<Filter Include="Source Files\zlib">
62-
<UniqueIdentifier>{cb92df18-9435-4db9-997a-e0e7d532cd26}</UniqueIdentifier>
62+
<UniqueIdentifier>{7b2ea923-8454-4073-bb9c-85de0f66caa1}</UniqueIdentifier>
6363
</Filter>
6464
<Filter Include="Source Files\jenkins">
65-
<UniqueIdentifier>{2920175c-439c-4fd5-b94e-8cf1d3aaadd3}</UniqueIdentifier>
65+
<UniqueIdentifier>{5404ec38-706a-47f8-97b7-941c2574ddf2}</UniqueIdentifier>
6666
</Filter>
6767
</ItemGroup>
6868
<ItemGroup>
@@ -80,10 +80,10 @@
8080
<ClInclude Include="src\StormCommon.h">
8181
<Filter>Header Files</Filter>
8282
</ClInclude>
83-
<ClInclude Include="include\StormLib.h">
83+
<ClInclude Include="src\StormLib.h">
8484
<Filter>Header Files</Filter>
8585
</ClInclude>
86-
<ClInclude Include="include\StormPort.h">
86+
<ClInclude Include="src\StormPort.h">
8787
<Filter>Header Files</Filter>
8888
</ClInclude>
8989
<ClInclude Include="src\adpcm\adpcm.h">
@@ -103,6 +103,9 @@
103103
</ClInclude>
104104
</ItemGroup>
105105
<ItemGroup>
106+
<ClCompile Include="stormlib_dll\DllMain.c">
107+
<Filter>Source Files</Filter>
108+
</ClCompile>
106109
<ClCompile Include="src\FileStream.cpp">
107110
<Filter>Source Files</Filter>
108111
</ClCompile>
@@ -112,6 +115,9 @@
112115
<ClCompile Include="src\SBaseFileTable.cpp">
113116
<Filter>Source Files</Filter>
114117
</ClCompile>
118+
<ClCompile Include="src\SBaseSubTypes.cpp">
119+
<Filter>Source Files</Filter>
120+
</ClCompile>
115121
<ClCompile Include="src\SCompression.cpp">
116122
<Filter>Source Files</Filter>
117123
</ClCompile>
@@ -280,6 +286,48 @@
280286
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_decode_utf8_string.c">
281287
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
282288
</ClCompile>
289+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c">
290+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
291+
</ClCompile>
292+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c">
293+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
294+
</ClCompile>
295+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c">
296+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
297+
</ClCompile>
298+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c">
299+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
300+
</ClCompile>
301+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c">
302+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
303+
</ClCompile>
304+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c">
305+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
306+
</ClCompile>
307+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c">
308+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
309+
</ClCompile>
310+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c">
311+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
312+
</ClCompile>
313+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c">
314+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
315+
</ClCompile>
316+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c">
317+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
318+
</ClCompile>
319+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c">
320+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
321+
</ClCompile>
322+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c">
323+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
324+
</ClCompile>
325+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c">
326+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
327+
</ClCompile>
328+
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c">
329+
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
330+
</ClCompile>
283331
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_length_bit_string.c">
284332
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
285333
</ClCompile>
@@ -343,9 +391,15 @@
343391
<ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_decode.c">
344392
<Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
345393
</ClCompile>
394+
<ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c">
395+
<Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
396+
</ClCompile>
346397
<ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_decode.c">
347398
<Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
348399
</ClCompile>
400+
<ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c">
401+
<Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
402+
</ClCompile>
349403
<ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_exptmod.c">
350404
<Filter>Source Files\libtomcrypt\pk\rsa</Filter>
351405
</ClCompile>
@@ -358,6 +412,9 @@
358412
<ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_make_key.c">
359413
<Filter>Source Files\libtomcrypt\pk\rsa</Filter>
360414
</ClCompile>
415+
<ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c">
416+
<Filter>Source Files\libtomcrypt\pk\rsa</Filter>
417+
</ClCompile>
361418
<ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_verify_hash.c">
362419
<Filter>Source Files\libtomcrypt\pk\rsa</Filter>
363420
</ClCompile>
@@ -745,6 +802,9 @@
745802
<ClCompile Include="src\zlib\adler32.c">
746803
<Filter>Source Files\zlib</Filter>
747804
</ClCompile>
805+
<ClCompile Include="src\zlib\compress_zlib.c">
806+
<Filter>Source Files\zlib</Filter>
807+
</ClCompile>
748808
<ClCompile Include="src\zlib\crc32.c">
749809
<Filter>Source Files\zlib</Filter>
750810
</ClCompile>
@@ -769,62 +829,10 @@
769829
<ClCompile Include="src\jenkins\lookup3.c">
770830
<Filter>Source Files\jenkins</Filter>
771831
</ClCompile>
772-
<ClCompile Include="src\zlib\compress_zlib.c">
773-
<Filter>Source Files\zlib</Filter>
774-
</ClCompile>
775-
<ClCompile Include="src\SBaseSubTypes.cpp">
832+
</ItemGroup>
833+
<ItemGroup>
834+
<None Include="stormlib_dll\StormLib.def">
776835
<Filter>Source Files</Filter>
777-
</ClCompile>
778-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_bit_string.c">
779-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
780-
</ClCompile>
781-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_boolean.c">
782-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
783-
</ClCompile>
784-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_ia5_string.c">
785-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
786-
</ClCompile>
787-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_integer.c">
788-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
789-
</ClCompile>
790-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_object_identifier.c">
791-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
792-
</ClCompile>
793-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_octet_string.c">
794-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
795-
</ClCompile>
796-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_printable_string.c">
797-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
798-
</ClCompile>
799-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_ex.c">
800-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
801-
</ClCompile>
802-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_sequence_multi.c">
803-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
804-
</ClCompile>
805-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_set.c">
806-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
807-
</ClCompile>
808-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_setof.c">
809-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
810-
</ClCompile>
811-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_short_integer.c">
812-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
813-
</ClCompile>
814-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utctime.c">
815-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
816-
</ClCompile>
817-
<ClCompile Include="src\libtomcrypt\src\pk\asn1\der_encode_utf8_string.c">
818-
<Filter>Source Files\libtomcrypt\pk\asn1</Filter>
819-
</ClCompile>
820-
<ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_pss_encode.c">
821-
<Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
822-
</ClCompile>
823-
<ClCompile Include="src\libtomcrypt\src\pk\pkcs1\pkcs_1_v1_5_encode.c">
824-
<Filter>Source Files\libtomcrypt\pk\pkcs1</Filter>
825-
</ClCompile>
826-
<ClCompile Include="src\libtomcrypt\src\pk\rsa\rsa_sign_hash.c">
827-
<Filter>Source Files\libtomcrypt\pk\rsa</Filter>
828-
</ClCompile>
836+
</None>
829837
</ItemGroup>
830838
</Project>

0 commit comments

Comments
 (0)