diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-09-24 20:46:19 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-09-24 20:46:19 +0000 |
commit | 55cd14f87572150e6fb4e9e9135e344883f667e2 (patch) | |
tree | 54bbbda3f7e97fea875ddd3875bc1d34e65ff7f1 | |
parent | 0cab10e2f5b16d0425713c6dfe691007510c2f4a (diff) | |
download | rockbox-55cd14f87572150e6fb4e9e9135e344883f667e2.tar.gz rockbox-55cd14f87572150e6fb4e9e9135e344883f667e2.zip |
Make beastpatcher build with VS2005 again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22821 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | tools/mknkboot.c | 12 | ||||
-rw-r--r-- | utils/MTP/beastpatcher/vs2005/beastpatcher.vcproj | 16 |
2 files changed, 20 insertions, 8 deletions
diff --git a/tools/mknkboot.c b/tools/mknkboot.c index e63840427e..6ac26428bc 100644 --- a/tools/mknkboot.c +++ b/tools/mknkboot.c | |||
@@ -42,8 +42,12 @@ | |||
42 | #include <sys/types.h> | 42 | #include <sys/types.h> |
43 | #include <sys/stat.h> | 43 | #include <sys/stat.h> |
44 | #include <fcntl.h> | 44 | #include <fcntl.h> |
45 | #if defined(_MSC_VER) | ||
46 | #include "pstdint.h" | ||
47 | #else | ||
45 | #include <unistd.h> | 48 | #include <unistd.h> |
46 | #include <inttypes.h> | 49 | #include <inttypes.h> |
50 | #endif | ||
47 | 51 | ||
48 | #include "mknkboot.h" | 52 | #include "mknkboot.h" |
49 | 53 | ||
@@ -118,10 +122,10 @@ static uint32_t dualboot[] = | |||
118 | 122 | ||
119 | static void put_uint32le(uint32_t x, unsigned char* p) | 123 | static void put_uint32le(uint32_t x, unsigned char* p) |
120 | { | 124 | { |
121 | p[0] = x & 0xff; | 125 | p[0] = (unsigned char)(x & 0xff); |
122 | p[1] = (x >> 8) & 0xff; | 126 | p[1] = (unsigned char)((x >> 8) & 0xff); |
123 | p[2] = (x >> 16) & 0xff; | 127 | p[2] = (unsigned char)((x >> 16) & 0xff); |
124 | p[3] = (x >> 24) & 0xff; | 128 | p[3] = (unsigned char)((x >> 24) & 0xff); |
125 | } | 129 | } |
126 | 130 | ||
127 | #if !defined(BEASTPATCHER) | 131 | #if !defined(BEASTPATCHER) |
diff --git a/utils/MTP/beastpatcher/vs2005/beastpatcher.vcproj b/utils/MTP/beastpatcher/vs2005/beastpatcher.vcproj index 69925a8d2c..295fd91c60 100644 --- a/utils/MTP/beastpatcher/vs2005/beastpatcher.vcproj +++ b/utils/MTP/beastpatcher/vs2005/beastpatcher.vcproj | |||
@@ -41,8 +41,8 @@ | |||
41 | <Tool | 41 | <Tool |
42 | Name="VCCLCompilerTool" | 42 | Name="VCCLCompilerTool" |
43 | Optimization="0" | 43 | Optimization="0" |
44 | AdditionalIncludeDirectories="c:\wmsdk\wmfsdk95\include;c:\wmsdk\wmfsdk95\wmdm\inc" | 44 | AdditionalIncludeDirectories=""$(ProjectDir)..";"$(ProjectDir)..\..\..\..\tools";c:\wmsdk\wmfsdk95\include;c:\wmsdk\wmfsdk95\wmdm\inc" |
45 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MTP_NODLL;WITH_BOOTOBJS" | 45 | PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MTP_NODLL;WITH_BOOTOBJS;BEASTPATCHER" |
46 | MinimalRebuild="true" | 46 | MinimalRebuild="true" |
47 | BasicRuntimeChecks="3" | 47 | BasicRuntimeChecks="3" |
48 | RuntimeLibrary="0" | 48 | RuntimeLibrary="0" |
@@ -120,8 +120,8 @@ | |||
120 | /> | 120 | /> |
121 | <Tool | 121 | <Tool |
122 | Name="VCCLCompilerTool" | 122 | Name="VCCLCompilerTool" |
123 | AdditionalIncludeDirectories="c:\wmsdk\wmfsdk95\include;c:\wmsdk\wmfsdk95\wmdm\inc" | 123 | AdditionalIncludeDirectories=""$(ProjectDir)..";"$(ProjectDir)..\..\..\..\tools";c:\wmsdk\wmfsdk95\include;c:\wmsdk\wmfsdk95\wmdm\inc" |
124 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MTP_NODLL" | 124 | PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MTP_NODLL;BEASTPATCHER" |
125 | RuntimeLibrary="2" | 125 | RuntimeLibrary="2" |
126 | UsePrecompiledHeader="0" | 126 | UsePrecompiledHeader="0" |
127 | WarningLevel="3" | 127 | WarningLevel="3" |
@@ -191,6 +191,10 @@ | |||
191 | > | 191 | > |
192 | </File> | 192 | </File> |
193 | <File | 193 | <File |
194 | RelativePath="..\..\..\..\tools\mknkboot.c" | ||
195 | > | ||
196 | </File> | ||
197 | <File | ||
194 | RelativePath="..\mtp_win32.c" | 198 | RelativePath="..\mtp_win32.c" |
195 | > | 199 | > |
196 | </File> | 200 | </File> |
@@ -225,6 +229,10 @@ | |||
225 | > | 229 | > |
226 | </File> | 230 | </File> |
227 | <File | 231 | <File |
232 | RelativePath="..\..\..\..\tools\mknkboot.h" | ||
233 | > | ||
234 | </File> | ||
235 | <File | ||
228 | RelativePath="..\mtp_common.h" | 236 | RelativePath="..\mtp_common.h" |
229 | > | 237 | > |
230 | </File> | 238 | </File> |