summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2008-07-04 11:38:08 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2008-07-04 11:38:08 +0000
commit46d8302c7d557033b75705795c46b56f20d98b71 (patch)
tree06659474d82ab097e9333c39ae6ebabf0de940ae /utils
parent1213e5bcb3424eb59d0c1ea8ff86a3f68fe07245 (diff)
downloadrockbox-46d8302c7d557033b75705795c46b56f20d98b71.tar.gz
rockbox-46d8302c7d557033b75705795c46b56f20d98b71.tar.bz2
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
Diffstat (limited to 'utils')
-rwxr-xr-xutils/MTP/MTP_DLL.dllbin86016 -> 86016 bytes
-rw-r--r--utils/MTP/MTP_DLL/MTP_DLL.vcproj9
-rw-r--r--utils/MTP/Makefile2
-rwxr-xr-xutils/MTP/sendfirm.exe.manifest8
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 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="d:\wmsdk\wmfsdk95\include;d:\wmsdk\wmfsdk95\wmdm\inc"
+ AdditionalIncludeDirectories="c:\wmsdk\wmfsdk95\include;c:\wmsdk\wmfsdk95\wmdm\inc"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MTP_DLL_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
Name="VCLinkerTool"
AdditionalDependencies="mssachlp.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="d:\wmsdk\wmfsdk95\lib,d:\wmsdk\wmfsdk95\wmdm\lib"
+ AdditionalLibraryDirectories="c:\wmsdk\wmfsdk95\lib,c:\wmsdk\wmfsdk95\wmdm\lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -118,7 +118,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="d:\wmsdk\wmfsdk95\include;d:\wmsdk\wmfsdk95\wmdm\inc"
+ AdditionalIncludeDirectories="c:\wmsdk\wmfsdk95\include;c:\wmsdk\wmfsdk95\wmdm\inc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MTP_DLL_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@@ -139,7 +139,8 @@
Name="VCLinkerTool"
AdditionalDependencies="mssachlp.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="d:\wmsdk\wmfsdk95\lib,d:\wmsdk\wmfsdk95\wmdm\lib"
+ AdditionalLibraryDirectories="c:\wmsdk\wmfsdk95\lib,c:\wmsdk\wmfsdk95\wmdm\lib"
+ GenerateManifest="true"
GenerateDebugInformation="false"
SubSystem="2"
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
gcc $(CFLAGS) $(LIBS) -o $(OUTPUT) sendfirm.c
$(OUTPUT).exe: sendfirm_win.c
- gcc $(CFLAGS) -o $(OUTPUT).exe sendfirm_win.c MTP_DLL.dll
+ mingw32-gcc $(CFLAGS) -o $(OUTPUT).exe sendfirm_win.c MTP_DLL.dll
clean:
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 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.762' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
+ </dependentAssembly>
+ </dependency>
+</assembly>