Mercurial > dwindows

changeset 758:842bc671eaa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added manifest files that will import the common controls library that allows for XP/Vista/7 themes to be used.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 17 Mar 2011 17:34:58 +0000
parents d26bfc4cd1f0
children 6d880e68e8d4
files makefile.vc win/dw.dll.x64.manifest win/dw.dll.x86.manifest win/dwtest.exe.x64.manifest win/dwtest.exe.x86.manifest
diffstat 5 files changed, 90 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/makefile.vc	Thu Mar 17 16:42:53 2011 +0000
+++ b/makefile.vc	Thu Mar 17 17:34:58 2011 +0000
@@ -87,7 +87,7 @@
 $(LIBS)
 <<
 	lib /def:$(DEFFILE) /out:dw.lib
-	mt.exe /manifest dw.dll.manifest /outputresource:dw.dll;2
+	mt.exe /manifest dw.dll.manifest win\dw.dll.$(TARGET_CPU).manifest /outputresource:dw.dll;2
         copy dw.lib $(DWLIBDIR)\dw.lib
         copy dw.dll $(DWDLLDIR)\dw.dll
 
@@ -127,7 +127,7 @@
 
 dwtest.exe: dwtest.obj winmain.obj
 	$(LINK) $(LINKFLAGS) /out:dwtest.exe dwtest.obj winmain.obj /subsystem:windows $(DWLIBDIR)\dwcompat.lib $(DWLIBDIR)\dw.lib $(LIBS)
-	mt.exe /manifest dwtest.exe.manifest /outputresource:dwtest.exe;1
+	mt.exe /manifest dwtest.exe.manifest win\dwtest.exe.$(TARGET_CPU).manifest /outputresource:dwtest.exe;1
 
 zip: dw.dll
 	copy win\readme-win.txt .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/win/dw.dll.x64.manifest	Thu Mar 17 17:34:58 2011 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.1.0.0"
+    processorArchitecture="AMD64"
+    name="dw"
+    type="win32"
+/>
+<description>Dynamic Windows</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="AMD64"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/win/dw.dll.x86.manifest	Thu Mar 17 17:34:58 2011 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.1.0.0"
+    processorArchitecture="X86"
+    name="dw"
+    type="win32"
+/>
+<description>Dynamic Windows</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/win/dwtest.exe.x64.manifest	Thu Mar 17 17:34:58 2011 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.1.0.0"
+    processorArchitecture="AMD64"
+    name="dwtest"
+    type="win32"
+/>
+<description>Dynamic Windows Test</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="AMD64"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/win/dwtest.exe.x86.manifest	Thu Mar 17 17:34:58 2011 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.1.0.0"
+    processorArchitecture="X86"
+    name="dwtest"
+    type="win32"
+/>
+<description>Dynamic Windows Test</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
\ No newline at end of file