Browse code
updating git commits, sln to fix build, and most importantly adding macro definitions to cltypes in support of Windows.
Micah Snyder authored on 2017/10/13 06:00:27Showing 4 changed files
| ... | ... |
@@ -69,7 +69,6 @@ |
| 69 | 69 |
|
| 70 | 70 |
/* Ensure we have print format types */ |
| 71 | 71 |
/* PRIu64 should be in <inttypes.h> */ |
| 72 |
-#ifndef PRIu64 |
|
| 73 | 72 |
#ifndef _SF64_PREFIX |
| 74 | 73 |
#if SIZEOF_LONG == 8 |
| 75 | 74 |
#define _SF64_PREFIX "l" |
| ... | ... |
@@ -78,9 +77,14 @@ |
| 78 | 78 |
#endif |
| 79 | 79 |
#endif |
| 80 | 80 |
|
| 81 |
+#ifndef PRIu64 |
|
| 81 | 82 |
#define PRIu64 _SF64_PREFIX "u" |
| 82 |
-#define PRIi64 _SF64_PREFIX "i" |
|
| 83 |
-#define PRIx64 _SF64_PREFIX "x" |
|
| 83 |
+#endif |
|
| 84 |
+#ifndef PRIx64 |
|
| 85 |
+#define PRIx64 _SF64_PREFIX "i" |
|
| 86 |
+#endif |
|
| 87 |
+#ifndef PRIi64 |
|
| 88 |
+#define PRIi64 _SF64_PREFIX "x" |
|
| 84 | 89 |
#endif |
| 85 | 90 |
|
| 86 | 91 |
#ifndef STDu64 |
| ... | ... |
@@ -67,14 +67,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamunrar_iface", "libcl
|
| 67 | 67 |
{B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7} = {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}
|
| 68 | 68 |
EndProjectSection |
| 69 | 69 |
EndProject |
| 70 |
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup-x86", "Setup-x86\Setup-x86.vdproj", "{048ECA7F-4F7D-45B9-A02D-593240356556}"
|
|
| 71 |
-EndProject |
|
| 72 |
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup-x64", "Setup-x64\Setup-x64.vdproj", "{9C42D9BA-08AC-44E4-BAA8-145F7F44389A}"
|
|
| 73 |
-EndProject |
|
| 74 | 70 |
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mspack", "mspack.vcxproj", "{AA443662-4AED-4F50-95E4-9B5BB5429E9E}"
|
| 75 | 71 |
EndProject |
| 76 | 72 |
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openssl", "openssl.vcxproj", "{5661EB2A-7AE6-4C1A-864B-FDDD32F3D45A}"
|
| 77 | 73 |
EndProject |
| 74 |
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup-x64", "Setup-x64\Setup-x64.vdproj", "{92C046F5-ED35-4CF1-B016-F7052EFB3AD3}"
|
|
| 75 |
+EndProject |
|
| 76 |
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup-x86", "Setup-x86\Setup-x86.vdproj", "{3E02EED1-D085-4311-9DA7-C5966451A1BE}"
|
|
| 77 |
+EndProject |
|
| 78 | 78 |
Global |
| 79 | 79 |
GlobalSection(SolutionConfigurationPlatforms) = preSolution |
| 80 | 80 |
Debug|Win32 = Debug|Win32 |
| ... | ... |
@@ -265,22 +265,6 @@ Global |
| 265 | 265 |
{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|Win32.Build.0 = Release-Static|Win32
|
| 266 | 266 |
{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|x64.ActiveCfg = Release-Static|x64
|
| 267 | 267 |
{2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|x64.Build.0 = Release-Static|x64
|
| 268 |
- {048ECA7F-4F7D-45B9-A02D-593240356556}.Debug|Win32.ActiveCfg = Debug
|
|
| 269 |
- {048ECA7F-4F7D-45B9-A02D-593240356556}.Debug|Win32.Build.0 = Debug
|
|
| 270 |
- {048ECA7F-4F7D-45B9-A02D-593240356556}.Debug|x64.ActiveCfg = Debug
|
|
| 271 |
- {048ECA7F-4F7D-45B9-A02D-593240356556}.Release|Win32.ActiveCfg = Release
|
|
| 272 |
- {048ECA7F-4F7D-45B9-A02D-593240356556}.Release|Win32.Build.0 = Release
|
|
| 273 |
- {048ECA7F-4F7D-45B9-A02D-593240356556}.Release|x64.ActiveCfg = Release
|
|
| 274 |
- {048ECA7F-4F7D-45B9-A02D-593240356556}.Release-Static|Win32.ActiveCfg = Release
|
|
| 275 |
- {048ECA7F-4F7D-45B9-A02D-593240356556}.Release-Static|x64.ActiveCfg = Release
|
|
| 276 |
- {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Debug|Win32.ActiveCfg = Debug
|
|
| 277 |
- {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Debug|x64.ActiveCfg = Debug
|
|
| 278 |
- {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Debug|x64.Build.0 = Debug
|
|
| 279 |
- {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release|Win32.ActiveCfg = Release
|
|
| 280 |
- {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release|x64.ActiveCfg = Release
|
|
| 281 |
- {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release|x64.Build.0 = Release
|
|
| 282 |
- {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release-Static|Win32.ActiveCfg = Release
|
|
| 283 |
- {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release-Static|x64.ActiveCfg = Release
|
|
| 284 | 268 |
{AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Debug|Win32.ActiveCfg = Debug|Win32
|
| 285 | 269 |
{AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Debug|Win32.Build.0 = Debug|Win32
|
| 286 | 270 |
{AA443662-4AED-4F50-95E4-9B5BB5429E9E}.Debug|x64.ActiveCfg = Debug|x64
|
| ... | ... |
@@ -305,6 +289,28 @@ Global |
| 305 | 305 |
{5661EB2A-7AE6-4C1A-864B-FDDD32F3D45A}.Release-Static|Win32.Build.0 = Release|Win32
|
| 306 | 306 |
{5661EB2A-7AE6-4C1A-864B-FDDD32F3D45A}.Release-Static|x64.ActiveCfg = Release|x64
|
| 307 | 307 |
{5661EB2A-7AE6-4C1A-864B-FDDD32F3D45A}.Release-Static|x64.Build.0 = Release|x64
|
| 308 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Debug|Win32.ActiveCfg = Debug
|
|
| 309 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Debug|x64.ActiveCfg = Debug
|
|
| 310 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Debug|x64.Build.0 = Debug
|
|
| 311 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Release|Win32.ActiveCfg = Release
|
|
| 312 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Release|Win32.Build.0 = Release
|
|
| 313 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Release|x64.ActiveCfg = Release
|
|
| 314 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Release|x64.Build.0 = Release
|
|
| 315 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Release-Static|Win32.ActiveCfg = Release
|
|
| 316 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Release-Static|Win32.Build.0 = Release
|
|
| 317 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Release-Static|x64.ActiveCfg = Release
|
|
| 318 |
+ {92C046F5-ED35-4CF1-B016-F7052EFB3AD3}.Release-Static|x64.Build.0 = Release
|
|
| 319 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Debug|Win32.ActiveCfg = Debug
|
|
| 320 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Debug|Win32.Build.0 = Debug
|
|
| 321 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Debug|x64.ActiveCfg = Debug
|
|
| 322 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Release|Win32.ActiveCfg = Release
|
|
| 323 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Release|Win32.Build.0 = Release
|
|
| 324 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Release|x64.ActiveCfg = Release
|
|
| 325 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Release|x64.Build.0 = Release
|
|
| 326 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Release-Static|Win32.ActiveCfg = Release
|
|
| 327 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Release-Static|Win32.Build.0 = Release
|
|
| 328 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Release-Static|x64.ActiveCfg = Release
|
|
| 329 |
+ {3E02EED1-D085-4311-9DA7-C5966451A1BE}.Release-Static|x64.Build.0 = Release
|
|
| 308 | 330 |
EndGlobalSection |
| 309 | 331 |
GlobalSection(SolutionProperties) = preSolution |
| 310 | 332 |
HideSolutionNode = FALSE |