Skip to content
Browse files

Provide manifest resource for 32-bit windows executable.

* src/runtime/sbcl-win32.manifest: new file

* src/runtime/sbcl-win.rc: use appropriate sbcl-winXX.manifest

* src/runtime/Config.x86-win32: add windres rules and sbcl-win.res.o
object

etc.
  • Loading branch information...
1 parent 934cbaa commit eb335868a9009800f1faba24996d9e53d47b3e07 @akovalenko committed Jan 13, 2012
Showing with 21 additions and 1 deletion.
  1. +5 −0 src/runtime/Config.x86-win32
  2. +4 −0 src/runtime/sbcl-win.rc
  3. +11 −0 src/runtime/sbcl-win32.manifest
  4. +1 −1 src/runtime/sbcl-win64.manifest
View
5 src/runtime/Config.x86-win32
@@ -15,6 +15,7 @@ ASSEM_SRC = x86-assem.S
ARCH_SRC = x86-arch.c
OS_SRC = win32-os.c x86-win32-os.c os-common.c pthreads_win32.c
+OS_OBJS = sbcl-win.res.o
# The "--Wl,--export-dynamic" flags are here to help people
# experimenting with callbacks from C to SBCL, by allowing linkage to
@@ -66,6 +67,10 @@ CPP = cpp
CC = gcc
LD = ld
NM = nm
+RC = windres
+
+%.res.o: %.rc
+ $(RC) -o "$@" "$<"
mangled-stuff.exe: gen1a-undefs
$(CC) -nostdlib -Wl,-r -Wl,-whole-archive \
View
4 src/runtime/sbcl-win.rc
@@ -4,4 +4,8 @@
#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
#endif
+#ifdef __x86_64__
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "sbcl-win64.manifest"
+#else
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "sbcl-win32.manifest"
+#endif
View
11 src/runtime/sbcl-win32.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
+ xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <assemblyIdentity
+ version="1.0.55.0"
+ processorArchitecture="x86"
+ name="CommonLisp.Sbcl.runtime"
+ type="win32"
+ />
+ <description>Steel Bank Common Lisp</description>
+</assembly>
View
2 src/runtime/sbcl-win64.manifest
@@ -2,7 +2,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
- version="1.0.46.0"
+ version="1.0.55.0"
processorArchitecture="AMD64"
name="CommonLisp.Sbcl.runtime"
type="win32"

0 comments on commit eb33586

Please sign in to comment.
Something went wrong with that request. Please try again.