diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-07-04 11:38:08 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-07-04 11:38:08 +0000 |
commit | 46d8302c7d557033b75705795c46b56f20d98b71 (patch) | |
tree | 06659474d82ab097e9333c39ae6ebabf0de940ae | |
parent | 1213e5bcb3424eb59d0c1ea8ff86a3f68fe07245 (diff) | |
download | rockbox-46d8302c7d557033b75705795c46b56f20d98b71.tar.gz rockbox-46d8302c7d557033b75705795c46b56f20d98b71.zip |
Make sendfirm_win.c compile and work
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17938 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | utils/MTP/MTP_DLL.dll | bin | 86016 -> 86016 bytes | |||
-rw-r--r-- | utils/MTP/MTP_DLL/MTP_DLL.vcproj | 9 | ||||
-rw-r--r-- | utils/MTP/Makefile | 2 | ||||
-rwxr-xr-x | utils/MTP/sendfirm.exe.manifest | 8 |
4 files changed, 14 insertions, 5 deletions
diff --git a/utils/MTP/MTP_DLL.dll b/utils/MTP/MTP_DLL.dll index 1985f0ef30..f3436e049c 100755 --- a/utils/MTP/MTP_DLL.dll +++ b/utils/MTP/MTP_DLL.dll | |||
Binary files differ | |||
diff --git a/utils/MTP/MTP_DLL/MTP_DLL.vcproj b/utils/MTP/MTP_DLL/MTP_DLL.vcproj index 295ef49d80..3d7fa43475 100644 --- a/utils/MTP/MTP_DLL/MTP_DLL.vcproj +++ b/utils/MTP/MTP_DLL/MTP_DLL.vcproj | |||
@@ -40,7 +40,7 @@ | |||
40 | <Tool | 40 | <Tool |
41 | Name="VCCLCompilerTool" | 41 | Name="VCCLCompilerTool" |
42 | Optimization="0" | 42 | Optimization="0" |
43 | AdditionalIncludeDirectories="d:\wmsdk\wmfsdk95\include;d:\wmsdk\wmfsdk95\wmdm\inc" | 43 | AdditionalIncludeDirectories="c:\wmsdk\wmfsdk95\include;c:\wmsdk\wmfsdk95\wmdm\inc" |
44 | PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MTP_DLL_EXPORTS" | 44 | PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MTP_DLL_EXPORTS" |
45 | MinimalRebuild="true" | 45 | MinimalRebuild="true" |
46 | BasicRuntimeChecks="3" | 46 | BasicRuntimeChecks="3" |
@@ -63,7 +63,7 @@ | |||
63 | Name="VCLinkerTool" | 63 | Name="VCLinkerTool" |
64 | AdditionalDependencies="mssachlp.lib" | 64 | AdditionalDependencies="mssachlp.lib" |
65 | LinkIncremental="2" | 65 | LinkIncremental="2" |
66 | AdditionalLibraryDirectories="d:\wmsdk\wmfsdk95\lib,d:\wmsdk\wmfsdk95\wmdm\lib" | 66 | AdditionalLibraryDirectories="c:\wmsdk\wmfsdk95\lib,c:\wmsdk\wmfsdk95\wmdm\lib" |
67 | GenerateDebugInformation="true" | 67 | GenerateDebugInformation="true" |
68 | SubSystem="2" | 68 | SubSystem="2" |
69 | TargetMachine="1" | 69 | TargetMachine="1" |
@@ -118,7 +118,7 @@ | |||
118 | /> | 118 | /> |
119 | <Tool | 119 | <Tool |
120 | Name="VCCLCompilerTool" | 120 | Name="VCCLCompilerTool" |
121 | AdditionalIncludeDirectories="d:\wmsdk\wmfsdk95\include;d:\wmsdk\wmfsdk95\wmdm\inc" | 121 | AdditionalIncludeDirectories="c:\wmsdk\wmfsdk95\include;c:\wmsdk\wmfsdk95\wmdm\inc" |
122 | PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MTP_DLL_EXPORTS" | 122 | PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MTP_DLL_EXPORTS" |
123 | RuntimeLibrary="2" | 123 | RuntimeLibrary="2" |
124 | UsePrecompiledHeader="2" | 124 | UsePrecompiledHeader="2" |
@@ -139,7 +139,8 @@ | |||
139 | Name="VCLinkerTool" | 139 | Name="VCLinkerTool" |
140 | AdditionalDependencies="mssachlp.lib" | 140 | AdditionalDependencies="mssachlp.lib" |
141 | LinkIncremental="1" | 141 | LinkIncremental="1" |
142 | AdditionalLibraryDirectories="d:\wmsdk\wmfsdk95\lib,d:\wmsdk\wmfsdk95\wmdm\lib" | 142 | AdditionalLibraryDirectories="c:\wmsdk\wmfsdk95\lib,c:\wmsdk\wmfsdk95\wmdm\lib" |
143 | GenerateManifest="true" | ||
143 | GenerateDebugInformation="false" | 144 | GenerateDebugInformation="false" |
144 | SubSystem="2" | 145 | SubSystem="2" |
145 | OptimizeReferences="2" | 146 | OptimizeReferences="2" |
diff --git a/utils/MTP/Makefile b/utils/MTP/Makefile index 63e7b3adf5..9cbacd85d6 100644 --- a/utils/MTP/Makefile +++ b/utils/MTP/Makefile | |||
@@ -8,7 +8,7 @@ $(OUTPUT): sendfirm.c | |||
8 | gcc $(CFLAGS) $(LIBS) -o $(OUTPUT) sendfirm.c | 8 | gcc $(CFLAGS) $(LIBS) -o $(OUTPUT) sendfirm.c |
9 | 9 | ||
10 | $(OUTPUT).exe: sendfirm_win.c | 10 | $(OUTPUT).exe: sendfirm_win.c |
11 | gcc $(CFLAGS) -o $(OUTPUT).exe sendfirm_win.c MTP_DLL.dll | 11 | mingw32-gcc $(CFLAGS) -o $(OUTPUT).exe sendfirm_win.c MTP_DLL.dll |
12 | 12 | ||
13 | clean: | 13 | clean: |
14 | rm -f $(OUTPUT) | 14 | rm -f $(OUTPUT) |
diff --git a/utils/MTP/sendfirm.exe.manifest b/utils/MTP/sendfirm.exe.manifest new file mode 100755 index 0000000000..324c707e1c --- /dev/null +++ b/utils/MTP/sendfirm.exe.manifest | |||
@@ -0,0 +1,8 @@ | |||
1 | <?xml version='1.0' encoding='UTF-8' standalone='yes'?> | ||
2 | <assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> | ||
3 | <dependency> | ||
4 | <dependentAssembly> | ||
5 | <assemblyIdentity type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.762' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' /> | ||
6 | </dependentAssembly> | ||
7 | </dependency> | ||
8 | </assembly> | ||