suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: use PLT_WIN_GTK for gtk; fix manifest embedding

Browse Source
This commit is contained in:
Matthew Flatt 2010-10-09 08:55:03 -06:00
parent ba581819fb
commit 815278fe43
5 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
collects/mred/private/wx/platform.rkt
View File

@ -3,10 +3,14 @@
(provide (all-defined-out)) (provide (all-defined-out))
(define-runtime-path platform-lib (define-runtime-path platform-lib
(case (system-type) (let ([gtk-lib
[(#;windows) '(lib "mred/private/wx/win32/platform.rkt")] '(lib "mred/private/wx/gtk/platform.rkt")])
[(macosx) '(lib "mred/private/wx/cocoa/platform.rkt")] (case (system-type)
[(windows unix) '(lib "mred/private/wx/gtk/platform.rkt")])) [(windows) (if (getenv "PLT_WIN_GTK")
gtk-lib
'(lib "mred/private/wx/win32/platform.rkt"))]
[(maxcosx) '(lib "mred/private/wx/cocoa/platform.rkt")]
[(unix) gtk-lib])))
(define-values (button% (define-values (button%
canvas% canvas%

46
src/gracket/get-libs.rkt
View File

@ -58,27 +58,31 @@
["libpng14.14.dylib" 192224] ["libpng14.14.dylib" 192224]
["PSMTabBarControl.tgz" 107171])])] ["PSMTabBarControl.tgz" 107171])])]
[(windows) [(windows)
'(["freetype6.dll" 535264] (let ([basic '(["libjpeg-7.dll" 233192]
["libgobject-2.0-0.dll" 316586] ["libcairo-2.dll" 921369]
["libatk-1.0-0.dll" 153763] ["libpango-1.0-0.dll" 336626]
["libgtk-win32-2.0-0.dll" 4740156] ["libexpat-1.dll" 143096]
["libcairo-2.dll" 921369] ["libpng14-14.dll" 219305]
["libjpeg-7.dll" 233192] ["zlib1.dll" 55808]
["libexpat-1.dll" 143096] ["freetype6.dll" 535264]
["libpango-1.0-0.dll" 336626] ["libfontconfig-1.dll" 279059]
["libfontconfig-1.dll" 279059] ["libglib-2.0-0.dll" 1110713]
["libpangocairo-1.0-0.dll" 95189] ["libgobject-2.0-0.dll" 316586]
["libgdk-win32-2.0-0.dll" 827670] ["libgmodule-2.0-0.dll" 31692]
["libpangoft2-1.0-0.dll" 679322] ["libpangocairo-1.0-0.dll" 95189]
["libgdk_pixbuf-2.0-0.dll" 252150] ["libpangowin32-1.0-0.dll" 102210]
["libpangowin32-1.0-0.dll" 102210] ["libpangoft2-1.0-0.dll" 679322])])
["libgio-2.0-0.dll" 669318] (if (getenv "PLT_WIN_GTK")
["libpng14-14.dll" 219305] (append
["libglib-2.0-0.dll" 1110713] basic
["libwimp.dll" 69632] '(["libatk-1.0-0.dll" 153763]
["libgmodule-2.0-0.dll" 31692] ["libgtk-win32-2.0-0.dll" 4740156]
["zlib1.dll" 55808] ["libgdk-win32-2.0-0.dll" 827670]
["gtkrc" 1181])])) ["libgdk_pixbuf-2.0-0.dll" 252150]
["libgio-2.0-0.dll" 669318]
["libwimp.dll" 69632]
["gtkrc" 1181]))
basic))]))
(define explained? #f) (define explained? #f)

2
src/worksp/gc2/make.rkt
View File

@ -311,6 +311,7 @@
'("libracket3mxxxxxxx.dll") '("libracket3mxxxxxxx.dll")
'("delayimp.lib") '("delayimp.lib")
exe "" #t)) exe "" #t))
(system- "mt.exe -manifest ../../../Racket.exe.manifest -outputresource:../../../Racket.exe;1")
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -343,6 +344,7 @@
'("advapi32.lib" '("advapi32.lib"
"delayimp.lib") "delayimp.lib")
"../../../GRacket.exe" " /subsystem:windows" #t)) "../../../GRacket.exe" " /subsystem:windows" #t))
(system- "mt.exe -manifest ../../../GRacket.exe.manifest -outputresource:../../../GRacket.exe;1")
(system- "cl.exe /MT /O2 /DMZ_PRECISE_GC /I../../racket/include /I.. /c ../../racket/dynsrc/mzdyn.c /Fomzdyn3m.obj") (system- "cl.exe /MT /O2 /DMZ_PRECISE_GC /I../../racket/include /I.. /c ../../racket/dynsrc/mzdyn.c /Fomzdyn3m.obj")
(system- "lib.exe -def:../../racket/dynsrc/mzdyn.def -out:mzdyn3m.lib") (system- "lib.exe -def:../../racket/dynsrc/mzdyn.def -out:mzdyn3m.lib")

2
src/worksp/gracket/gracket.manifest
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity <assemblyIdentity
version="5.0.2.1" version="5.0.2.1"

2
src/worksp/racket/racket.manifest
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity <assemblyIdentity
version="5.0.1.6" version="5.0.1.6"